diff --git a/src/common/k8s-api/json-api.ts b/src/common/k8s-api/json-api.ts
index ef35921feb..5ebd30650d 100644
--- a/src/common/k8s-api/json-api.ts
+++ b/src/common/k8s-api/json-api.ts
@@ -65,7 +65,7 @@ export class JsonApi<D = JsonApiData, P extends JsonApiParams = JsonApiParams> {
     debug: false
   };
 
-  constructor(protected config: JsonApiConfig, protected reqInit?: RequestInit) {
+  constructor(public readonly config: JsonApiConfig, protected reqInit?: RequestInit) {
     this.config = Object.assign({}, JsonApi.configDefault, config);
     this.reqInit = merge({}, JsonApi.reqInitDefault, reqInit);
     this.parseResponse = this.parseResponse.bind(this);
diff --git a/src/common/k8s-api/kube-api.ts b/src/common/k8s-api/kube-api.ts
index 22c7dca9c8..1131119a3b 100644
--- a/src/common/k8s-api/kube-api.ts
+++ b/src/common/k8s-api/kube-api.ts
@@ -26,7 +26,7 @@ import { stringify } from "querystring";
 import { apiKubePrefix, isDevelopment } from "../../common/vars";
 import logger from "../../main/logger";
 import { apiManager } from "./api-manager";
-import { apiKube } from "./index";
+import { apiBase, apiKube } from "./index";
 import { createKubeApiURL, parseKubeApi } from "./kube-api-parse";
 import { KubeObjectConstructor, KubeObject, KubeStatus } from "./kube-object";
 import byline from "byline";
@@ -97,12 +97,12 @@ export interface IKubeApiCluster {
 
 export function forCluster<T extends KubeObject>(cluster: IKubeApiCluster, kubeClass: KubeObjectConstructor<T>): KubeApi<T> {
   const request = new KubeJsonApi({
-    serverAddress: `http://127.0.0.1:${process.env.LENS_PROXY_PORT}`,
+    serverAddress: apiBase.config.serverAddress,
     apiBase: apiKubePrefix,
     debug: isDevelopment,
   }, {
     headers: {
-      "Host": `${cluster.metadata.uid}.localhost:${process.env.LENS_PROXY_PORT}`
+      "Host": apiBase.config.serverAddress
     }
   });