diff --git a/packages/core/src/common/k8s-api/kube-object.store.ts b/packages/core/src/common/k8s-api/kube-object.store.ts
index 571e395a7b..affeb8c144 100644
--- a/packages/core/src/common/k8s-api/kube-object.store.ts
+++ b/packages/core/src/common/k8s-api/kube-object.store.ts
@@ -113,15 +113,15 @@ export abstract class KubeObjectStore<
     this.bindWatchEventsUpdater();
   }
 
-  // TODO: Circular dependency: KubeObjectStore -> ClusterFrameContext -> NamespaceStore -> KubeObjectStore
   @computed get contextItems(): K[] {
+    if (!this.api.isNamespaced) {
+      return this.items;
+    }
+
     const namespaces = this.dependencies.context.contextNamespaces;
 
-    return this.items.filter(item => {
-      const itemNamespace = item.getNs();
-
-      return !itemNamespace /* cluster-wide */ || namespaces.includes(itemNamespace);
-    });
+    return this.items
+      .filter(item => namespaces.includes(item.getNs() as string));
   }
 
   getTotalCount(): number {
diff --git a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts
index 86189e4634..3befeeafed 100644
--- a/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts
+++ b/packages/core/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts
@@ -24,15 +24,10 @@ const replicasetsWorkloadInjectable = getInjectable({
         group: "apps",
       },
       open: navigate,
-
-      amountOfItems: computed(
-        () => store.getAllByNs(namespaceStore.contextNamespaces).length,
-      ),
-
+      amountOfItems: computed(() => store.getTotalCount()),
       status: computed(() =>
         store.getStatuses(store.getAllByNs(namespaceStore.contextNamespaces)),
       ),
-
       title: ResourceNames.replicasets,
       orderNumber: 50,
     };