diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-controller.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-controller.test.ts
index 1f57442701..224cc13893 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-controller.test.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-controller.test.ts
@@ -361,7 +361,6 @@ describe('UmbBaseExtensionController', () => {
 						expect(extensionController.manifest?.weight).to.be.undefined;
 						expect(extensionController.manifest?.conditions?.length).to.be.equal(0);
 					} else if (count === 2) {
-						console.log('Kind change was tricked');
 						// Second time render, there is a matching kind and then weight is 123.
 						expect(extensionController.manifest?.weight).to.be.equal(123);
 						expect(extensionController.manifest?.conditions?.length).to.be.equal(0);
@@ -374,7 +373,6 @@ describe('UmbBaseExtensionController', () => {
 			);
 			extensionController.asPromise().then(() => {
 				initialPromiseResolved = true;
-				console.log('Was resolved.');
 				Promise.resolve().then(() => {
 					extensionRegistry.register(lateComingKind);
 				});
diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.ts
index 321e42b9b4..4b04fc9be5 100644
--- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.ts
+++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.ts
@@ -1,3 +1,4 @@
+import { of, switchMap } from 'rxjs';
 import type { ManifestTypeMap, ManifestBase, SpecificManifestTypeOrManifestBase, ManifestKind } from '../types.js';
 import { UmbBasicState } from '@umbraco-cms/backoffice/observable-api';
 import { map, Observable, distinctUntilChanged, combineLatest } from '@umbraco-cms/backoffice/external/rxjs';
@@ -178,29 +179,33 @@ export class UmbExtensionRegistry<
 	}
 
 	getByAlias<T extends ManifestBase = ManifestBase>(alias: string) {
-		return combineLatest([
-			this.extensions.pipe(
-				map((exts) => exts.find((ext) => ext.alias === alias)),
-				distinctUntilChanged(extensionSingleMemoization)
-			),
-		]).pipe(
-			map(([ext]) => {
-				// Specific Extension Meta merge (does not merge conditions)
-				if (ext) {
-					// Since we dont have the type up front in this request, we will just get all kinds here and find the matching one:
-					const baseManifest = this._kinds
-						.getValue()
-						.find((kind) => kind.matchType === ext.type && kind.matchKind === ext.kind)?.manifest;
-					if (baseManifest) {
-						const merged = { isMatchedWithKind: true, ...baseManifest, ...ext } as any;
-						if ((baseManifest as any).meta) {
-							merged.meta = { ...(baseManifest as any).meta, ...(ext as any).meta };
-						}
-						return merged;
-					}
+		return this.extensions.pipe(
+			map((exts) => exts.find((ext) => ext.alias === alias)),
+			distinctUntilChanged(extensionSingleMemoization),
+			switchMap((ext) => {
+				if (ext?.kind) {
+					return this._kindsOfType(ext.type).pipe(
+						map((kinds) => {
+							// Specific Extension Meta merge (does not merge conditions)
+							if (ext) {
+								// Since we dont have the type up front in this request, we will just get all kinds here and find the matching one:
+								const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
+								// TODO: This check can go away when making a find kind based on type and kind.
+								if (baseManifest) {
+									const merged = { isMatchedWithKind: true, ...baseManifest, ...ext } as any;
+									if ((baseManifest as any).meta) {
+										merged.meta = { ...(baseManifest as any).meta, ...(ext as any).meta };
+									}
+									return merged;
+								}
+							}
+							return ext;
+						})
+					);
 				}
-				return ext;
+				return of(ext);
 			}),
+
 			distinctUntilChanged(extensionAndKindMatchSingleMemoization)
 		) as Observable<T | undefined>;
 	}