diff --git a/src/common/catalog-entities/kubernetes-cluster.ts b/src/common/catalog-entities/kubernetes-cluster.ts
index 4d1362cdc2..dc6d36d023 100644
--- a/src/common/catalog-entities/kubernetes-cluster.ts
+++ b/src/common/catalog-entities/kubernetes-cluster.ts
@@ -53,11 +53,8 @@ export interface KubernetesClusterStatus extends CatalogEntityStatus {
 }
 
 export class KubernetesCluster extends CatalogEntity<CatalogEntityMetadata, KubernetesClusterStatus, KubernetesClusterSpec> {
-  static apiVersion = "entity.k8slens.dev/v1alpha1";
-  static kind = "KubernetesCluster";
-
-  public readonly apiVersion = KubernetesCluster.apiVersion;
-  public readonly kind = KubernetesCluster.kind;
+  public readonly apiVersion = "entity.k8slens.dev/v1alpha1";
+  public readonly kind = "KubernetesCluster";
 
   async connect(): Promise<void> {
     if (app) {
diff --git a/src/common/cluster-ipc.ts b/src/common/cluster-ipc.ts
index 58a580588d..b1cced3edf 100644
--- a/src/common/cluster-ipc.ts
+++ b/src/common/cluster-ipc.ts
@@ -26,7 +26,7 @@ import { ResourceApplier } from "../main/resource-applier";
 import { ipcMain, IpcMainInvokeEvent } from "electron";
 import { clusterFrameMap } from "./cluster-frames";
 import { catalogEntityRegistry } from "../main/catalog";
-import { KubernetesCluster } from "./catalog-entities";
+import type { KubernetesCluster } from "./catalog-entities";
 
 export const clusterActivateHandler = "cluster:activate";
 export const clusterSetFrameIdHandler = "cluster:set-frame-id";
@@ -55,7 +55,7 @@ if (ipcMain) {
   handleRequest(clusterVisibilityHandler, (event: IpcMainInvokeEvent, clusterId: ClusterId, visible: boolean) => {
     const entity = catalogEntityRegistry.getById<KubernetesCluster>(clusterId);
 
-    for (const kubeEntity of catalogEntityRegistry.getItemsForApiKind(KubernetesCluster.apiVersion, KubernetesCluster.kind)) {
+    for (const kubeEntity of catalogEntityRegistry.getItemsForApiKind(entity.apiVersion, entity.kind)) {
       kubeEntity.status.active = false;
     }