diff --git a/src/features/cluster/extension-api/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx b/src/features/cluster/extension-api/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx
index 0c69f49f80..fcd5044639 100644
--- a/src/features/cluster/extension-api/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx
+++ b/src/features/cluster/extension-api/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx
@@ -10,7 +10,6 @@ import { getApplicationBuilder } from "../../../renderer/components/test-utils/g
 import type { TestExtensionRenderer } from "../../../renderer/components/test-utils/get-extension-fake";
 import type { KubernetesCluster } from "../../../common/catalog-entities";
 import React from "react";
-import extensionShouldBeEnabledForClusterFrameInjectable from "../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable";
 
 describe("disable-cluster-pages-when-cluster-is-not-relevant", () => {
   let builder: ApplicationBuilder;
@@ -23,10 +22,6 @@ describe("disable-cluster-pages-when-cluster-is-not-relevant", () => {
 
     builder.setEnvironmentToClusterFrame();
 
-    builder.beforeWindowStart((windowDi) => {
-      windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
-    });
-
     isEnabledForClusterMock = asyncFn();
 
     const testExtension = {
diff --git a/src/features/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx b/src/features/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx
index f94a0049d9..efc16c8ef2 100644
--- a/src/features/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx
+++ b/src/features/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx
@@ -9,7 +9,6 @@ import type { ApplicationBuilder } from "../../../renderer/components/test-utils
 import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import type { KubernetesCluster } from "../../../common/catalog-entities";
 import React from "react";
-import extensionShouldBeEnabledForClusterFrameInjectable from "../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable";
 
 describe("disable sidebar items when cluster is not relevant", () => {
   let builder: ApplicationBuilder;
@@ -21,10 +20,6 @@ describe("disable sidebar items when cluster is not relevant", () => {
 
     builder.setEnvironmentToClusterFrame();
 
-    builder.beforeWindowStart((windowDi) => {
-      windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
-    });
-
     isEnabledForClusterMock = asyncFn();
 
     const testExtension = {
diff --git a/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx b/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx
index d6ee52a664..319e089f3b 100644
--- a/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx
+++ b/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx
@@ -15,7 +15,6 @@ import React from "react";
 import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token";
 import { routeSpecificComponentInjectionToken } from "../../../../renderer/routes/route-specific-component-injection-token";
 import { KubeObject } from "../../../../common/k8s-api/kube-object";
-import extensionShouldBeEnabledForClusterFrameInjectable from "../../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable";
 import apiManagerInjectable from "../../../../common/k8s-api/api-manager/manager.injectable";
 import { KubeObjectDetails } from "../../../../renderer/components/kube-object-details";
 import type { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store";
@@ -46,8 +45,6 @@ describe("disable kube object detail items when cluster is not relevant", () =>
       apiManager.registerApi(api);
       apiManager.registerStore(store);
 
-      windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
-
       runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
diff --git a/src/features/cluster/kube-object-menu/extension-api/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx b/src/features/cluster/kube-object-menu/extension-api/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx
index 75df0f9359..f7dff90f24 100644
--- a/src/features/cluster/kube-object-menu/extension-api/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx
+++ b/src/features/cluster/kube-object-menu/extension-api/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx
@@ -15,7 +15,6 @@ import React from "react";
 import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token";
 import { routeSpecificComponentInjectionToken } from "../../../../renderer/routes/route-specific-component-injection-token";
 import { KubeObject } from "../../../../common/k8s-api/kube-object";
-import extensionShouldBeEnabledForClusterFrameInjectable from "../../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable";
 import { KubeObjectMenu } from "../../../../renderer/components/kube-object-menu";
 
 describe("disable kube object menu items when cluster is not relevant", () => {
@@ -31,8 +30,6 @@ describe("disable kube object menu items when cluster is not relevant", () => {
     builder.setEnvironmentToClusterFrame();
 
     builder.beforeWindowStart((windowDi) => {
-      windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
-
       runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
diff --git a/src/features/cluster/kube-object-status-icon/extension-api/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx b/src/features/cluster/kube-object-status-icon/extension-api/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx
index b3bc2b3716..49fae34daf 100644
--- a/src/features/cluster/kube-object-status-icon/extension-api/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx
+++ b/src/features/cluster/kube-object-status-icon/extension-api/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx
@@ -17,7 +17,6 @@ import { routeSpecificComponentInjectionToken } from "../../../../renderer/route
 import { KubeObjectStatusIcon } from "../../../../renderer/components/kube-object-status-icon/kube-object-status-icon";
 import { KubeObject } from "../../../../common/k8s-api/kube-object";
 import { KubeObjectStatusLevel } from "../../../../common/k8s-api/kube-object-status";
-import extensionShouldBeEnabledForClusterFrameInjectable from "../../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable";
 
 describe("disable kube object statuses when cluster is not relevant", () => {
   let builder: ApplicationBuilder;
@@ -32,8 +31,6 @@ describe("disable kube object statuses when cluster is not relevant", () => {
     builder.setEnvironmentToClusterFrame();
 
     builder.beforeWindowStart((windowDi) => {
-      windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
-
       runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
diff --git a/src/features/cluster/kube-object-status-icon/extension-api/reactively-hide-kube-object-status.test.tsx b/src/features/cluster/kube-object-status-icon/extension-api/reactively-hide-kube-object-status.test.tsx
index 8e197f3f30..aebc03a0f4 100644
--- a/src/features/cluster/kube-object-status-icon/extension-api/reactively-hide-kube-object-status.test.tsx
+++ b/src/features/cluster/kube-object-status-icon/extension-api/reactively-hide-kube-object-status.test.tsx
@@ -12,7 +12,6 @@ import { observable, runInAction, computed } from "mobx";
 import React from "react";
 import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token";
 import { routeSpecificComponentInjectionToken } from "../../../../renderer/routes/route-specific-component-injection-token";
-import extensionShouldBeEnabledForClusterFrameInjectable from "../../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable";
 import { KubeObject } from "../../../../common/k8s-api/kube-object";
 import { KubeObjectStatusLevel } from "../../../../common/k8s-api/kube-object-status";
 import { KubeObjectStatusIcon } from "../../../../renderer/components/kube-object-status-icon";
@@ -28,8 +27,6 @@ describe("reactively hide kube object status", () => {
     builder.setEnvironmentToClusterFrame();
 
     builder.beforeWindowStart((windowDi) => {
-      windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
-
       runInAction(() => {
         windowDi.register(testRouteInjectable, testRouteComponentInjectable);
       });
diff --git a/src/features/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx b/src/features/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx
index 1ac5a2d17c..e40b7361fb 100644
--- a/src/features/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx
+++ b/src/features/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx
@@ -8,7 +8,6 @@ import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../../../../renderer/components/test-utils/get-application-builder";
 import type { KubernetesCluster } from "../../../../../common/catalog-entities";
 import { getApplicationBuilder } from "../../../../../renderer/components/test-utils/get-application-builder";
-import extensionShouldBeEnabledForClusterFrameInjectable from "../../../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable";
 import navigateToWorkloadsOverviewInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/overview/navigate-to-workloads-overview.injectable";
 import React from "react";
 
@@ -23,9 +22,6 @@ describe("disable workloads overview details when cluster is not relevant", () =
     builder = getApplicationBuilder();
 
     builder.setEnvironmentToClusterFrame();
-    builder.beforeWindowStart((windowDi) => {
-      windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable);
-    });
 
     isEnabledForClusterMock = asyncFn();
 
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 5b47f738a0..c6572f365b 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -19,8 +19,6 @@ import platformInjectable from "../common/vars/platform.injectable";
 import startTopbarStateSyncInjectable from "./components/layout/top-bar/start-state-sync.injectable";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 import watchHistoryStateInjectable from "./remote-helpers/watch-history-state.injectable";
-import extensionShouldBeEnabledForClusterFrameInjectable from "./extension-loader/extension-should-be-enabled-for-cluster-frame.injectable";
-import { asyncComputed } from "@ogre-tools/injectable-react";
 import legacyOnChannelListenInjectable from "./ipc/legacy-channel-listen.injectable";
 import storageSaveDelayInjectable from "./utils/create-storage/storage-save-delay.injectable";
 import environmentVariablesInjectable from "../common/utils/environment-variables.injectable";
@@ -89,12 +87,6 @@ export const getDiForUnitTesting = (
 
     di.override(requestAnimationFrameInjectable, () => (callback) => callback());
     di.override(lensResourcesDirInjectable, () => "/irrelevant");
-
-    // TODO: Remove after "LensRendererExtension.isEnabledForCluster" is removed
-    di.override(extensionShouldBeEnabledForClusterFrameInjectable, () =>
-      asyncComputed({ getValueFromObservedPromise: async () => true, valueWhenPending: true }),
-    );
-
     di.override(environmentVariablesInjectable, () => ({}));
     di.override(watchHistoryStateInjectable, () => () => () => {});