diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst
index 8b5d9d659..6b39dbf9e 100644
--- a/docs/en_US/release_notes.rst
+++ b/docs/en_US/release_notes.rst
@@ -11,6 +11,7 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_5_5
    release_notes_5_4
    release_notes_5_3
    release_notes_5_2
diff --git a/docs/en_US/release_notes_5_5.rst b/docs/en_US/release_notes_5_5.rst
new file mode 100644
index 000000000..3df2eb2d2
--- /dev/null
+++ b/docs/en_US/release_notes_5_5.rst
@@ -0,0 +1,20 @@
+************
+Version 5.5
+************
+
+Release date: 2021-07-15
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 5.4.
+
+New features
+************
+
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+| `Issue #6489 <https://redmine.postgresql.org/issues/6489>`_ -  Fixed an issue where Execute/Refresh button should not be disabled when we run the empty query.
diff --git a/web/pgadmin/static/js/sqleditor/execute_query.js b/web/pgadmin/static/js/sqleditor/execute_query.js
index 2ee9c321f..e2105e2e6 100644
--- a/web/pgadmin/static/js/sqleditor/execute_query.js
+++ b/web/pgadmin/static/js/sqleditor/execute_query.js
@@ -56,7 +56,11 @@ class ExecuteQuery {
 
   execute(sqlStatement, explainPlan, connect) {
     // If it is an empty query, do nothing.
-    if (sqlStatement.length <= 0) return;
+    if (sqlStatement.length <= 0) {
+      // Enable query execution button if user execute empty query.
+      $('#btn-flash').prop('disabled', false);
+      return;
+    }
 
     const self = this;
     self.explainPlan = explainPlan;