diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/update.sql
index 757bcef64..3eeaf9e23 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/update.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/update.sql
@@ -1,7 +1,7 @@
 {% import 'macros/schemas/privilege.macros' as PRIVILEGE %}
 
 {% if data %}
-{% if o_data.pkgbodysrc and data.pkgbodysrc == '' %}
+{% if data.pkgheadsrc is defined and data.pkgheadsrc != o_data.pkgheadsrc and o_data.pkgbodysrc != None %}
 DROP PACKAGE BODY {{ conn|qtIdent(data.schema,data.name) }};
 {% endif %}
 {% if data.pkgheadsrc %}
@@ -11,15 +11,6 @@ IS
 {{data.pkgheadsrc}}
 END {{ conn|qtIdent(data.name) }};
 
-CREATE OR REPLACE PACKAGE BODY {{ conn|qtIdent(data.schema,data.name) }}
-IS
-{% if data.pkgbodysrc %}
-{{data.pkgbodysrc}}
-{% else %}
-{{o_data.pkgbodysrc}}
-{% endif %}
-END {{ conn|qtIdent(data.name) }};
-{% else %}
 {% if data.pkgbodysrc %}
 
 CREATE OR REPLACE PACKAGE BODY {{ conn|qtIdent(data.schema,data.name) }}
@@ -27,7 +18,6 @@ IS
 {{data.pkgbodysrc}}
 END {{ conn|qtIdent(data.name) }};
 {% endif %}
-{% endif %}
 {% if data.pkgacl %}
 {% if 'deleted' in data.pkgacl %}
 {% for priv in data.pkgacl.deleted %}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/update.sql
index 757bcef64..edcd88323 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/update.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/update.sql
@@ -1,7 +1,7 @@
 {% import 'macros/schemas/privilege.macros' as PRIVILEGE %}
 
 {% if data %}
-{% if o_data.pkgbodysrc and data.pkgbodysrc == '' %}
+{% if data.pkgheadsrc is defined and data.pkgheadsrc != o_data.pkgheadsrc and o_data.pkgbodysrc != None %}
 DROP PACKAGE BODY {{ conn|qtIdent(data.schema,data.name) }};
 {% endif %}
 {% if data.pkgheadsrc %}
@@ -11,15 +11,7 @@ IS
 {{data.pkgheadsrc}}
 END {{ conn|qtIdent(data.name) }};
 
-CREATE OR REPLACE PACKAGE BODY {{ conn|qtIdent(data.schema,data.name) }}
-IS
-{% if data.pkgbodysrc %}
-{{data.pkgbodysrc}}
-{% else %}
-{{o_data.pkgbodysrc}}
 {% endif %}
-END {{ conn|qtIdent(data.name) }};
-{% else %}
 {% if data.pkgbodysrc %}
 
 CREATE OR REPLACE PACKAGE BODY {{ conn|qtIdent(data.schema,data.name) }}
@@ -27,7 +19,6 @@ IS
 {{data.pkgbodysrc}}
 END {{ conn|qtIdent(data.name) }};
 {% endif %}
-{% endif %}
 {% if data.pkgacl %}
 {% if 'deleted' in data.pkgacl %}
 {% for priv in data.pkgacl.deleted %}