diff --git a/src/renderer/api/api-manager.ts b/src/renderer/api/api-manager.ts
index a802851f65..9682b53f37 100644
--- a/src/renderer/api/api-manager.ts
+++ b/src/renderer/api/api-manager.ts
@@ -43,6 +43,14 @@ export class ApiManager {
     }
   }
 
+  updateStoreKey(oldKey: string) {
+    const store = this.stores.get(oldKey);
+
+    if (!store) return;
+    this.stores.delete(oldKey);
+    this.registerStore(store, [store.api]);
+  }
+
   @action
   registerStore(store: KubeObjectStore, apis: KubeApi[] = [store.api]) {
     apis.forEach(api => {
diff --git a/src/renderer/api/kube-api.ts b/src/renderer/api/kube-api.ts
index a880cc2406..cbe16bf3e6 100644
--- a/src/renderer/api/kube-api.ts
+++ b/src/renderer/api/kube-api.ts
@@ -229,8 +229,11 @@ export class KubeApi<T extends KubeObject = any> {
       });
 
       if (this.apiVersionPreferred) {
-        Object.defineProperty(this, "apiBase", { value: this.getUrl() });
+        const apiBase = this.getUrl();
+
+        Object.defineProperty(this, "apiBase", { value: apiBase });
         apiManager.registerApi(this.apiBase, this);
+        apiManager.updateStoreKey(this.objectConstructor.apiBase);
       }
     }
   }