diff --git a/packages/core/src/common/cluster-types.ts b/packages/core/src/common/cluster-types.ts
index ba01489152..048d972184 100644
--- a/packages/core/src/common/cluster-types.ts
+++ b/packages/core/src/common/cluster-types.ts
@@ -184,9 +184,7 @@ export const initialNodeShellImage = "docker.io/alpine:3.13";
  */
 export interface ClusterState {
   apiUrl: string;
-  online: boolean;
-  disconnected: boolean;
-  accessible: boolean;
+  connectionStatus: ClusterStatus | undefined;
   ready: boolean;
   isAdmin: boolean;
   allowedNamespaces: string[];
diff --git a/packages/core/src/common/cluster/cluster.ts b/packages/core/src/common/cluster/cluster.ts
index fc66d9aa29..8143563023 100644
--- a/packages/core/src/common/cluster/cluster.ts
+++ b/packages/core/src/common/cluster/cluster.ts
@@ -6,7 +6,7 @@
 import { computed, observable, toJS, runInAction } from "mobx";
 import type { KubeApiResource } from "../rbac";
 import type { ClusterState, ClusterId, ClusterMetadata, ClusterModel, ClusterPreferences, ClusterPrometheusPreferences, UpdateClusterModel, ClusterConfigData } from "../cluster-types";
-import { ClusterMetadataKey, clusterModelIdChecker, updateClusterModelChecker } from "../cluster-types";
+import { ClusterStatus, ClusterMetadataKey, clusterModelIdChecker, updateClusterModelChecker } from "../cluster-types";
 import type { IObservableValue } from "mobx";
 import { replaceObservableObject } from "../utils/replace-observable-object";
 import { pick } from "lodash";
@@ -32,15 +32,23 @@ export class Cluster {
    */
   readonly apiUrl: IObservableValue<string>;
 
+  readonly connectionStatus = observable.box<ClusterStatus>();
+
   /**
    * Describes if we can detect that cluster is online
    */
-  readonly online = observable.box(false);
+  readonly online = computed(() => {
+    const status = this.connectionStatus.get() ?? ClusterStatus.Offline;
+
+    return status > ClusterStatus.Offline;
+  });
 
   /**
    * Describes if user is able to access cluster resources
    */
-  readonly accessible = observable.box(false);
+  readonly accessible = computed(() => (
+    this.connectionStatus.get() === ClusterStatus.AccessGranted
+  ));
 
   /**
    * Is cluster instance in usable state
@@ -50,7 +58,9 @@ export class Cluster {
   /**
    * Is cluster disconnected. False if user has selected to connect.
    */
-  readonly disconnected = observable.box(true);
+  readonly disconnected = computed(() => (
+    this.connectionStatus.get() === undefined
+  ));
 
   /**
    * Does user have admin like access
@@ -188,14 +198,12 @@ export class Cluster {
   getState(): ClusterState {
     return {
       apiUrl: this.apiUrl.get(),
-      online: this.online.get(),
       ready: this.ready.get(),
-      disconnected: this.disconnected.get(),
-      accessible: this.accessible.get(),
       isAdmin: this.isAdmin.get(),
       allowedNamespaces: this.allowedNamespaces.toJSON(),
       resourcesToShow: this.resourcesToShow.toJSON(),
       isGlobalWatchEnabled: this.isGlobalWatchEnabled.get(),
+      connectionStatus: this.connectionStatus.get(),
     };
   }
 
@@ -204,15 +212,13 @@ export class Cluster {
    */
   setState(state: ClusterState) {
     runInAction(() => {
-      this.accessible.set(state.accessible);
       this.allowedNamespaces.replace(state.allowedNamespaces);
       this.resourcesToShow.replace(state.resourcesToShow);
       this.apiUrl.set(state.apiUrl);
-      this.disconnected.set(state.disconnected);
       this.isAdmin.set(state.isAdmin);
       this.isGlobalWatchEnabled.set(state.isGlobalWatchEnabled);
-      this.online.set(state.online);
       this.ready.set(state.ready);
+      this.connectionStatus.set(state.connectionStatus);
     });
   }
 
diff --git a/packages/core/src/main/cluster/cluster-connection.injectable.ts b/packages/core/src/main/cluster/cluster-connection.injectable.ts
index a79e0c034b..0bca81ebda 100644
--- a/packages/core/src/main/cluster/cluster-connection.injectable.ts
+++ b/packages/core/src/main/cluster/cluster-connection.injectable.ts
@@ -124,10 +124,6 @@ class ClusterConnection {
         this.dependencies.logger.info("[CLUSTER]: starting connection ...", this.cluster.getMeta());
 
         await this.dependencies.kubeAuthProxyServer.ensureRunning();
-
-        runInAction(() => {
-          this.cluster.disconnected.set(false);
-        });
       } catch (error) {
         this.dependencies.broadcastConnectionUpdate({
           level: "error",
@@ -185,10 +181,8 @@ class ClusterConnection {
     runInAction(() => {
       this.dependencies.logger.info(`[CLUSTER]: disconnecting`, { id: this.cluster.id });
       this.eventsDisposer();
-      this.dependencies.kubeAuthProxyServer?.stop();
-      this.cluster.disconnected.set(true);
-      this.cluster.online.set(false);
-      this.cluster.accessible.set(false);
+      this.dependencies.kubeAuthProxyServer.stop();
+      this.cluster.connectionStatus.set(undefined);
       this.cluster.ready.set(false);
       this.activated = false;
       this.cluster.allowedNamespaces.clear();
@@ -267,11 +261,10 @@ class ClusterConnection {
   }
 
   async refreshConnectionStatus() {
-    const connectionStatus = await this.getConnectionStatus();
+    const status = await this.getConnectionStatus();
 
     runInAction(() => {
-      this.cluster.online.set(connectionStatus > ClusterStatus.Offline);
-      this.cluster.accessible.set(connectionStatus == ClusterStatus.AccessGranted);
+      this.cluster.connectionStatus.set(status);
     });
   }