diff --git a/.version b/.version
index 64fb9e5e48..9c6b9cf4a6 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.66.1
+2.66.2
diff --git a/frontend/.version b/frontend/.version
index 64fb9e5e48..9c6b9cf4a6 100644
--- a/frontend/.version
+++ b/frontend/.version
@@ -1 +1 @@
-2.66.1
+2.66.2
diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index 5628e511c8..811557a7af 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -1581,7 +1581,12 @@ const EditorComponent = (props) => {
     if (!isVersionReleased && selectedComponents?.length > 1) {
       let newDefinition = JSON.parse(JSON.stringify(appDefinition));
 
-      removeSelectedComponent(currentPageId, newDefinition, selectedComponents, appDefinitionChanged);
+      const toDeleteComponents = removeSelectedComponent(
+        currentPageId,
+        newDefinition,
+        selectedComponents,
+        appDefinitionChanged
+      );
       const platform = navigator?.userAgentData?.platform || navigator?.platform || 'unknown';
       if (platform.toLowerCase().indexOf('mac') > -1) {
         toast('Selected components deleted! (⌘ + Z to undo)', {
@@ -1592,6 +1597,26 @@ const EditorComponent = (props) => {
           icon: '🗑️',
         });
       }
+
+      const allAppHints = useResolveStore.getState().suggestions.appHints ?? [];
+      const allHintsAssociatedWithQuery = [];
+
+      if (allAppHints.length > 0) {
+        toDeleteComponents.forEach((id) => {
+          const componentName = appDefinition.pages[currentPageId].components[id]?.component?.name;
+          if (componentName) {
+            allAppHints.forEach((suggestion) => {
+              if (suggestion?.hint.includes(componentName)) {
+                allHintsAssociatedWithQuery.push(suggestion.hint);
+              }
+            });
+          }
+        });
+      }
+
+      useResolveStore.getState().actions.removeEntitiesFromMap(toDeleteComponents);
+      useResolveStore.getState().actions.removeAppSuggestions(allHintsAssociatedWithQuery);
+
       updateEditorState({ selectedComponents: [] });
     } else if (isVersionReleased) {
       useAppVersionStore.getState().actions.enableReleasedVersionPopupState();
diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js
index 397ac7e9eb..76c35a7109 100644
--- a/frontend/src/_helpers/appUtils.js
+++ b/frontend/src/_helpers/appUtils.js
@@ -2098,6 +2098,7 @@ export const removeSelectedComponent = (pageId, newDefinition, selectedComponent
   useResolveStore.getState().actions.removeAppSuggestions(allHintsAssociatedWithQuery);
 
   updateAppDefinition(newDefinition, { componentDefinitionChanged: true, componentDeleted: true, componentCut: true });
+  return toDeleteComponents;
 };
 
 const getSelectedText = () => {
diff --git a/server/.version b/server/.version
index 64fb9e5e48..9c6b9cf4a6 100644
--- a/server/.version
+++ b/server/.version
@@ -1 +1 @@
-2.66.1
+2.66.2