diff --git a/src/renderer/components/cluster-manager/lens-views.ts b/src/renderer/components/cluster-manager/lens-views.ts
index 17e6c9f00d..da7efb377c 100644
--- a/src/renderer/components/cluster-manager/lens-views.ts
+++ b/src/renderer/components/cluster-manager/lens-views.ts
@@ -40,7 +40,15 @@ export async function initView(clusterId: ClusterId) {
 }
 
 export async function autoCleanOnRemove(clusterId: ClusterId, iframe: HTMLIFrameElement) {
-  await when(() => !clusterStore.getById(clusterId));
+  await when(() => {
+    const cluster = clusterStore.getById(clusterId);
+
+    if (!cluster) return true;
+
+    const view = lensViews.get(clusterId);
+
+    return cluster.disconnected && view?.isLoaded;
+  });
   logger.info(`[LENS-VIEW]: remove dashboard, clusterId=${clusterId}`);
   lensViews.delete(clusterId);