From ee501b496589a27cd5ef0ece5bda145a9e9705a4 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Tue, 9 Feb 2021 08:15:47 +0200
Subject: [PATCH] fix

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/renderer/kube-object.store.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<T extends KubeObject = any> 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<T extends KubeObject = any> 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),