diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts
index 4ea9f4370d..e96c79a0d3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts
@@ -45,7 +45,10 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 
 	#entityType: string;
 
-	#liveEditingModePromise?: Promise<boolean>;
+	#liveEditingModePromiseResolve?: (value: unknown) => void;
+	#liveEditingModePromise = new Promise((resolve) => {
+		this.#liveEditingModePromiseResolve = resolve;
+	});
 	#liveEditingMode?: boolean;
 
 	#initialLayout?: LayoutDataType;
@@ -88,13 +91,14 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 		this.#retrieveBlockManager = this.consumeContext(UMB_BLOCK_MANAGER_CONTEXT, (manager) => {
 			this.#blockManager = manager;
 
-			this.#liveEditingModePromise = this.observe(
+			this.observe(
 				manager.liveEditingMode,
 				(liveEditingMode) => {
-					this.#liveEditingMode = liveEditingMode;
+					this.#liveEditingMode = liveEditingMode ?? false;
+					this.#liveEditingModePromiseResolve?.();
 				},
 				'observeLiveEditingMode',
-			).asPromise();
+			);
 
 			this.observe(
 				observeMultiple([