diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index 73b576759e..d5eff8a625 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -1359,13 +1359,15 @@ const EditorComponent = (props) => {
         return appDefinition.pages[currentPageId].components[id].component.name;
       });
 
-      const currentComponents = newDefinition.pages[currentPageId].components;
+      // const currentComponents = newDefinition.pages[currentPageId].components;
 
-      const newComponentDefinition = useResolveStore
-        .getState()
-        .actions.findAndReplaceReferences(currentComponents, deletedComponentNames);
+      // // const newComponentDefinition = useResolveStore
+      // //   .getState()
+      // //   .actions.findAndReplaceReferences(currentComponents, deletedComponentNames);
 
-      newDefinition.pages[currentPageId].components = newComponentDefinition;
+      // // newDefinition.pages[currentPageId].components = newComponentDefinition;
+
+      // console.log('---arpit:::', { deletedComponentNames, currentComponents });
 
       appDefinitionChanged(newDefinition, {
         componentDefinitionChanged: true,
@@ -1385,6 +1387,20 @@ const EditorComponent = (props) => {
         });
       }
 
+      const newAppDefinition = JSON.parse(JSON.stringify(useEditorStore.getState().appDefinition));
+      const currentComponents = newAppDefinition.pages[currentPageId].components;
+
+      const newComponentDefinition = useResolveStore
+        .getState()
+        .actions.findAndReplaceReferences(currentComponents, deletedComponentNames);
+
+      newAppDefinition.pages[currentPageId].components = newComponentDefinition;
+
+      useEditorStore.getState().actions.updateEditorState({
+        appDefinition: newAppDefinition,
+        isUpdatingEditorStateInProcess: true,
+      });
+
       useResolveStore.getState().actions.removeEntitiesFromMap(deleteFromMap);
       useResolveStore.getState().actions.removeAppSuggestions(allHintsAssociatedWithQuery);
     } else {