diff --git a/frontend/src/Editor/QueryManager/QueryManager.jsx b/frontend/src/Editor/QueryManager/QueryManager.jsx
index bf39b5ab60..01401741f1 100644
--- a/frontend/src/Editor/QueryManager/QueryManager.jsx
+++ b/frontend/src/Editor/QueryManager/QueryManager.jsx
@@ -166,12 +166,13 @@ class QueryManagerComponent extends React.Component {
       }
     );
   };
-
   componentDidUpdate(prevState) {
-    if (prevState?.selectedQuery?.name !== this.state?.selectedQuery?.name) {
-      this.setState({
-        queryName: this.state.selectedQuery?.name,
-      });
+    if (this.state?.selectedQuery?.id == prevState?.selectedQuery?.id) {
+      if (prevState?.selectedQuery?.name !== this.state?.selectedQuery?.name) {
+        this.setState({
+          queryName: this.state.selectedQuery?.name,
+        });
+      }
     }
   }