diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-property/entity-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-property/entity-property.element.ts
index e5bf622351..8f58f11ba6 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-property/entity-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/entity-property/entity-property.element.ts
@@ -135,8 +135,8 @@ export class UmbEntityPropertyElement extends UmbLitElement {
 
 	private _observePropertyEditorUI() {
 		this.propertyEditorUIObserver?.destroy();
-		this.propertyEditorUIObserver = this.observe(umbExtensionsRegistry.getByAlias(this.propertyEditorUIAlias), (manifest) => {
-			if (manifest?.type === 'propertyEditorUI') {
+		this.propertyEditorUIObserver = this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorUI', this.propertyEditorUIAlias), (manifest) => {
+			if(manifest) {
 				this._gotEditor(manifest);
 			}
 		});
diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts
index a7fa6e245a..8ebdbdafe5 100644
--- a/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts
@@ -70,9 +70,13 @@ export class UmbExtensionRegistry {
 	}
 
 
-	getByAlias<T = ManifestTypes>(alias: string): Observable<T | null> {
+	getByAlias(alias: string) {
 		// TODO: make pipes prettier/simpler/reuseable
-		return this.extensions.pipe(map((dataTypes) => dataTypes.find((extension) => extension.alias === alias) || null)) as Observable<T | null>;
+		return this.extensions.pipe(map((dataTypes) => dataTypes.find((extension) => extension.alias === alias) || null));
+	}
+
+	getByTypeAndAlias(type: string, alias: string) {
+		return this.extensionsOfType(type).pipe(map((extensions) => extensions.find((extension) => extension.alias === alias) || null));
 	}
 
 	// TODO: implement unregister of extension