diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.repository.ts
index 2c9f04fc7c..c961dc6913 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/data-type-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbDataTypeTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbDataTypeTreeRootModel = {
 			unique: null,
 			entityType: UMB_DATA_TYPE_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_dataTypes',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.repository.ts
index b772686501..855b280b0d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbDictionaryTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbDictionaryTreeRootModel = {
 			unique: null,
 			entityType: UMB_DICTIONARY_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_dictionary',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.repository.ts
index 55e303dfc5..ac03769d7e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/tree/document-blueprint-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbDocumentBlueprintTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbDocumentBlueprintTreeRootModel = {
 			unique: null,
 			entityType: UMB_DOCUMENT_BLUEPRINT_ENTITY_TYPE,
 			name: 'Document Blueprints',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type-tree.repository.ts
index 15d2f7f74c..6cce66d739 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbDocumentTypeTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbDocumentTypeTreeRootModel = {
 			unique: null,
 			entityType: UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_documentTypes',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.repository.ts
index 999e7aff82..6869a26fae 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbDocumentTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbDocumentTreeRootModel = {
 			unique: null,
 			entityType: UMB_DOCUMENT_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_content',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.repository.ts
index deac728c26..12c5cba48e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbMediaTypeTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbMediaTypeTreeRootModel = {
 			unique: null,
 			entityType: UMB_MEDIA_TYPE_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_mediaTypes',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.repository.ts
index 7fea19f1ac..8b3478a9ed 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbMediaTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbMediaTreeRootModel = {
 			unique: null,
 			entityType: UMB_MEDIA_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_media',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/member-type-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/member-type-tree.repository.ts
index fa6123d7d7..d0f4dc69fc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/member-type-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/tree/member-type-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbMemberTypeTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbMemberTypeTreeRootModel = {
 			unique: null,
 			entityType: UMB_MEMBER_TYPE_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_memberTypes',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.repository.ts
index 7afccab991..42a317833d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbStaticFileTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbStaticFileTreeRootModel = {
 			unique: null,
 			entityType: UMB_STATIC_FILE_ROOT_ENTITY_TYPE,
 			name: 'Static Files',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.repository.ts
index 27cd6feb94..69b1777f4c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbPartialViewTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbPartialViewTreeRootModel = {
 			unique: null,
 			entityType: UMB_PARTIAL_VIEW_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_partialViews',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.repository.ts
index 2dec0c4450..bb3c68e1af 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.repository.ts
@@ -12,11 +12,14 @@ export class UmbScriptTreeRepository extends UmbTreeRepositoryBase<UmbScriptTree
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbScriptTreeRootModel = {
 			unique: null,
 			entityType: UMB_SCRIPT_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_scripts',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.repository.ts
index 3de3703eca..6edec84a7a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.repository.ts
@@ -14,11 +14,14 @@ export class UmbStylesheetTreeRepository extends UmbTreeRepositoryBase<
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbStylesheetTreeRootModel = {
 			unique: null,
 			entityType: UMB_STYLESHEET_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_stylesheets',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.repository.ts
index d4c5dbbcb4..77ec7b89aa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.repository.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.repository.ts
@@ -15,11 +15,14 @@ export class UmbTemplateTreeRepository
 	}
 
 	async requestTreeRoot() {
+		const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 1 });
+		const hasChildren = treeRootData ? treeRootData.total > 0 : false;
+
 		const data: UmbTemplateTreeRootModel = {
 			unique: null,
 			entityType: UMB_TEMPLATE_ROOT_ENTITY_TYPE,
 			name: '#treeHeaders_templates',
-			hasChildren: true,
+			hasChildren,
 			isFolder: true,
 		};