diff --git a/src/common/k8s-api/apis.ts b/src/common/k8s-api/api-base.ts
similarity index 64%
rename from src/common/k8s-api/apis.ts
rename to src/common/k8s-api/api-base.ts
index 441cb98687..e511dd8454 100644
--- a/src/common/k8s-api/apis.ts
+++ b/src/common/k8s-api/api-base.ts
@@ -4,13 +4,10 @@
  */
 
 import { JsonApi } from "./json-api";
-import { KubeJsonApi } from "./kube-json-api";
-import { apiKubePrefix, apiPrefix, isDebugging, isDevelopment } from "../../common/vars";
-import { isClusterPageContext } from "../utils/cluster-id-url-parsing";
+import { apiPrefix, isDebugging, isDevelopment } from "../vars";
 import { appEventBus } from "../app-event-bus/event-bus";
 
-let apiBase: JsonApi;
-let apiKube: KubeJsonApi;
+export let apiBase: JsonApi;
 
 if (typeof window === "undefined") {
   appEventBus.addListener((event) => {
@@ -41,20 +38,3 @@ if (typeof window === "undefined") {
     },
   });
 }
-
-if (isClusterPageContext()) {
-  apiKube = new KubeJsonApi({
-    serverAddress: `http://127.0.0.1:${window.location.port}`,
-    apiBase: apiKubePrefix,
-    debug: isDevelopment,
-  }, {
-    headers: {
-      "Host": window.location.host,
-    },
-  });
-}
-
-export {
-  apiBase,
-  apiKube,
-};
diff --git a/src/common/k8s-api/api-kube.ts b/src/common/k8s-api/api-kube.ts
new file mode 100644
index 0000000000..efe3059785
--- /dev/null
+++ b/src/common/k8s-api/api-kube.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { isClusterPageContext } from "../utils";
+import { KubeJsonApi } from "./kube-json-api";
+import { apiKubePrefix, isDevelopment } from "../vars";
+
+export const apiKube = isClusterPageContext()
+  ? new KubeJsonApi({
+    serverAddress: `http://127.0.0.1:${window.location.port}`,
+    apiBase: apiKubePrefix,
+    debug: isDevelopment,
+  }, {
+    headers: {
+      "Host": window.location.host,
+    },
+  })
+  : null;
diff --git a/src/common/k8s-api/index.ts b/src/common/k8s-api/index.ts
index 7d20c21de4..0d47a643f3 100644
--- a/src/common/k8s-api/index.ts
+++ b/src/common/k8s-api/index.ts
@@ -3,4 +3,5 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-export { apiBase, apiKube } from "./apis";
+export { apiBase } from "./api-base";
+export { apiKube } from "./api-kube";
diff --git a/src/common/k8s-api/kube-json-api.ts b/src/common/k8s-api/kube-json-api.ts
index 6fe253a643..30131545fe 100644
--- a/src/common/k8s-api/kube-json-api.ts
+++ b/src/common/k8s-api/kube-json-api.ts
@@ -6,7 +6,7 @@
 import { JsonApi, JsonApiData, JsonApiError } from "./json-api";
 import type { Response } from "node-fetch";
 import { apiKubePrefix, isDebugging } from "../vars";
-import { apiBase } from "./apis";
+import { apiBase } from "./api-base";
 
 export interface KubeJsonApiListMetadata {
   resourceVersion: string;