diff --git a/src/common/workspace-store.ts b/src/common/workspace-store.ts
index f0421aee6b..b9fe87c325 100644
--- a/src/common/workspace-store.ts
+++ b/src/common/workspace-store.ts
@@ -188,10 +188,8 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
   }
 
   @action
-  setLastActiveClusterId(clusterId: ClusterId, workspaceId = this.currentWorkspaceId) {
-    if (clusterId != null) {
-      this.getById(workspaceId).lastActiveClusterId = clusterId;
-    }
+  setLastActiveClusterId(clusterId?: ClusterId, workspaceId = this.currentWorkspaceId) {
+    this.getById(workspaceId).lastActiveClusterId = clusterId;
   }
 
   @action
diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx
index bc553f6acb..18a58db4e6 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.tsx
+++ b/src/renderer/components/cluster-manager/clusters-menu.tsx
@@ -57,11 +57,7 @@ export class ClustersMenu extends React.Component<Props> {
       menu.append(new MenuItem({
         label: _i18n._(t`Disconnect`),
         click: async () => {
-          const lastActiveClusterId = workspaceStore.currentWorkspace.lastActiveClusterId;
           if (clusterStore.isActive(cluster.id)) {
-            if (lastActiveClusterId === cluster.id) {
-              workspaceStore.setLastActiveClusterId("");
-            }
             navigate(landingURL());
             clusterStore.setActive(null);
           }
@@ -79,12 +75,9 @@ export class ClustersMenu extends React.Component<Props> {
             label: _i18n._(t`Remove`),
           },
           ok: () => {
-            const lastActiveClusterId = workspaceStore.currentWorkspace.lastActiveClusterId;
-            if (lastActiveClusterId === cluster.id) {
-              workspaceStore.setLastActiveClusterId("");
-            }
             if (clusterStore.activeClusterId === cluster.id) {
               navigate(landingURL());
+              clusterStore.setActive(null);
             }
             clusterStore.removeById(cluster.id);
           },