diff --git a/docs/en_US/release_notes_6_21.rst b/docs/en_US/release_notes_6_21.rst
index 2e569ec0d..cf0b65ab5 100644
--- a/docs/en_US/release_notes_6_21.rst
+++ b/docs/en_US/release_notes_6_21.rst
@@ -40,4 +40,7 @@ Bug fixes
   | `Issue #5760 <https://github.com/pgadmin-org/pgadmin4/issues/5760>`_ -  Fixed an issue where query was not pasted to editor after trojan source warning.
   | `Issue #5764 <https://github.com/pgadmin-org/pgadmin4/issues/5764>`_ -  Fix an issue where the maintenance dialog for Materialized View gives an error.
   | `Issue #5773 <https://github.com/pgadmin-org/pgadmin4/issues/5773>`_ -  Fixed an issue where Clear Saved Password should be disabled if the password is already cleared.
+  | `Issue #5790 <https://github.com/pgadmin-org/pgadmin4/issues/5790>`_ -  Fixed an issue where the user can't create trigger AFTER UPDATE OF.
+  | `Issue #5822 <https://github.com/pgadmin-org/pgadmin4/issues/5822>`_ -  Do not allow to save invalid JSON in query tool JSON editor.
   | `Issue #5847 <https://github.com/pgadmin-org/pgadmin4/issues/5847>`_ -  Fixed an issue where pgAdmin failed to connect when the Postgres password included special characters.
+  | `Issue #5872 <https://github.com/pgadmin-org/pgadmin4/issues/5872>`_ -  Handle MERGE operation in query tool explain introduced in PostgreSQL 15.
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
index 02469b629..1d5eabe12 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
@@ -181,10 +181,6 @@ export default class TriggerSchema extends BaseUISchema {
       flag = (state.evnt_update && (_.size(state.columns) >= 1 && state.columns[0] != ''));
     }
 
-    if(flag && state.name) {
-      state.name = null;
-    }
-
     return flag;
   }