diff --git a/src/renderer/kube-object.store.ts b/src/renderer/kube-object.store.ts index c84608f3ce..9a2a3da4e3 100644 --- a/src/renderer/kube-object.store.ts +++ b/src/renderer/kube-object.store.ts @@ -171,7 +171,7 @@ export abstract class KubeObjectStore extends ItemSt } @action - mergeItems(partialItems: T[], { replace = false, updateStore = true, sort = true, filter = true } = {}): T[] { + protected mergeItems(partialItems: T[], { replace = false, updateStore = true, sort = true, filter = true } = {}): T[] { let items = partialItems; // update existing items @@ -275,7 +275,7 @@ export abstract class KubeObjectStore extends ItemSt this.eventsBuffer.push(data); }; - if (this.context.cluster.isGlobalWatchEnabled) { + if (this.context.cluster?.isGlobalWatchEnabled && this.loadedNamespaces.length === 0) { disposers = apis.map(api => api.watch({ namespace: "", callback: (data) => callback(data),