diff --git a/src/common/k8s-api/__tests__/kube-object.store.test.ts b/src/common/k8s-api/__tests__/kube-object.store.test.ts
index 6a21fa69ca..afe755a6ba 100644
--- a/src/common/k8s-api/__tests__/kube-object.store.test.ts
+++ b/src/common/k8s-api/__tests__/kube-object.store.test.ts
@@ -17,7 +17,6 @@ class FakeKubeObjectStore extends KubeObjectStore<KubeObject> {
         hasSelectedAll: false,
         isGlobalWatchEnabled: () => true,
         isLoadingAll: () => true,
-        isNamespaceListStatic: () => false,
       },
     }, api as KubeApi<KubeObject>);
   }
diff --git a/src/renderer/cluster-frame-context/cluster-frame-context.ts b/src/renderer/cluster-frame-context/cluster-frame-context.ts
index 6257bdbea6..e23bac5fd4 100755
--- a/src/renderer/cluster-frame-context/cluster-frame-context.ts
+++ b/src/renderer/cluster-frame-context/cluster-frame-context.ts
@@ -11,7 +11,6 @@ export interface ClusterContext {
   readonly contextNamespaces: string[]; // selected by user (see: namespace-select.tsx)
   readonly hasSelectedAll: boolean;
 
-  isNamespaceListStatic(): boolean;
   isLoadingAll(namespaces: string[]): boolean;
   isGlobalWatchEnabled(): boolean;
 }
diff --git a/src/renderer/cluster-frame-context/for-cluster-scoped-resources.injectable.ts b/src/renderer/cluster-frame-context/for-cluster-scoped-resources.injectable.ts
index db13bc92d1..8392194a2b 100644
--- a/src/renderer/cluster-frame-context/for-cluster-scoped-resources.injectable.ts
+++ b/src/renderer/cluster-frame-context/for-cluster-scoped-resources.injectable.ts
@@ -18,7 +18,6 @@ const clusterFrameContextForClusterScopedResourcesInjectable = getInjectable({
       isGlobalWatchEnabled: () => cluster.isGlobalWatchEnabled,
       // This is always the case for cluster scoped resources
       isLoadingAll: () => true,
-      isNamespaceListStatic: () => cluster.accessibleNamespaces.length > 0,
       allNamespaces: [],
       contextNamespaces: [], // This value is used as a sentinal
       hasSelectedAll: true,
diff --git a/src/renderer/cluster-frame-context/for-namespaced-resources.injectable.ts b/src/renderer/cluster-frame-context/for-namespaced-resources.injectable.ts
index 61452ec7af..1eb85b3a43 100644
--- a/src/renderer/cluster-frame-context/for-namespaced-resources.injectable.ts
+++ b/src/renderer/cluster-frame-context/for-namespaced-resources.injectable.ts
@@ -42,7 +42,6 @@ const clusterFrameContextForNamespacedResourcesInjectable = getInjectable({
     });
 
     return {
-      isNamespaceListStatic: () => cluster.accessibleNamespaces.length > 0,
       isLoadingAll: (namespaces) => (
         allNamespaces.get().length > 1
         && cluster.accessibleNamespaces.length === 0
diff --git a/src/renderer/components/+namespaces/store.ts b/src/renderer/components/+namespaces/store.ts
index 6a85db04a3..794039e662 100644
--- a/src/renderer/components/+namespaces/store.ts
+++ b/src/renderer/components/+namespaces/store.ts
@@ -107,11 +107,13 @@ export class NamespaceStore extends KubeObjectStore<Namespace, NamespaceApi> {
   }
 
   subscribe() {
+    const clusterConfiguredAccessibleNamespaces = this.dependencies.clusterConfiguredAccessibleNamespaces.get();
+
     /**
      * if user has given static list of namespaces let's not start watches
      * because watch adds stuff that's not wanted or will just fail
      */
-    if (this.dependencies.context.isNamespaceListStatic()) {
+    if (clusterConfiguredAccessibleNamespaces.length > 0) {
       return noop;
     }