diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-controller.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-controller.ts
index 75b822297a..b847bb1228 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-controller.ts
@@ -4,8 +4,9 @@ import {
 	ManifestTypeMap,
 	SpecificManifestTypeOrManifestBase,
 	UmbBaseExtensionController,
+	UmbExtensionRegistry,
 } from '@umbraco-cms/backoffice/extension-api';
-import { ManifestTypes, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbBaseController, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 /**
@@ -22,6 +23,7 @@ export abstract class UmbBaseExtensionsController<
 
 	constructor(
 		host: UmbControllerHost,
+		extensionRegistry: UmbExtensionRegistry<ManifestType>,
 		type: ManifestTypeName,
 		filter: null | ((manifest: ManifestType) => boolean),
 		onChange: (permittedManifests: Array<PermittedControllerType>, controller: PermittedControllerType) => void
@@ -30,7 +32,7 @@ export abstract class UmbBaseExtensionsController<
 		this.#onChange = onChange;
 
 		// TODO: This could be optimized by just getting the aliases, well depends on the filter. (revisit one day to see how much filter is used)
-		let source = umbExtensionsRegistry?.extensionsOfType<ManifestTypeName, ManifestType>(type);
+		let source = extensionRegistry.extensionsOfType<ManifestTypeName, ManifestType>(type);
 		if (filter) {
 			source = source.pipe(map((extensions: Array<ManifestType>) => extensions.filter(filter)));
 		}
diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extensions-element-controller.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extensions-element-controller.ts
index 9b89276210..278ac25b94 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extensions-element-controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extensions-element-controller.ts
@@ -24,7 +24,7 @@ export class UmbExtensionsElementController<
 		onChange: (permittedManifests: Array<ControllerType>, controller: ControllerType) => void,
 		defaultElement?: string
 	) {
-		super(host, type, filter, onChange);
+		super(host, umbExtensionsRegistry, type, filter, onChange);
 		this._defaultElement = defaultElement;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extensions-manifest-controller.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extensions-manifest-controller.ts
index 0353391c27..d1c413d3f1 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extensions-manifest-controller.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extensions-manifest-controller.ts
@@ -24,7 +24,7 @@ export class UmbExtensionsManifestController<
 		filter: null | ((manifest: ManifestType) => boolean),
 		onChange: (permittedManifests: Array<PermittedControllerType>, controller: PermittedControllerType) => void
 	) {
-		super(host, type, filter, onChange);
+		super(host, umbExtensionsRegistry, type, filter, onChange);
 	}
 
 	protected _createController(manifest: ManifestType) {