diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts
index 815cd1d94f..05fb106310 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts
@@ -68,9 +68,7 @@ export class UmbTreeContextBase<TreeItemType extends TreeItemPresentationModel>
 		if (this.#treeAlias === treeAlias) return;
 		this.#treeAlias = treeAlias;
 
-		if (treeAlias) {
-			this.#observeTreeManifest();
-		}
+		this.#observeTreeManifest();
 	}
 
 	public getTreeAlias() {
@@ -139,16 +137,16 @@ export class UmbTreeContextBase<TreeItemType extends TreeItemPresentationModel>
 	}
 
 	#observeTreeManifest() {
-		this.observe(
-			umbExtensionsRegistry
-				.extensionsOfType('tree')
-				.pipe(map((treeManifests) => treeManifests.find((treeManifest) => treeManifest.alias === this.#treeAlias))),
-			async (treeManifest) => {
-				if (!treeManifest) return;
-				this.#observeRepository(treeManifest);
-			},
-			'_observeTreeManifest'
-		);
+		if (this.#treeAlias) {
+			this.observe(
+				umbExtensionsRegistry.getByTypeAndAlias('tree', this.#treeAlias),
+				async (treeManifest) => {
+					if (!treeManifest) return;
+					this.#observeRepository(treeManifest);
+				},
+				'_observeTreeManifest'
+			);
+		}
 	}
 
 	#observeRepository(treeManifest: ManifestTree) {