diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts
index 7079203714..bd457e40a4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts
@@ -192,7 +192,7 @@ export class UmbBlockElementManager extends UmbControllerBase {
 	}
 
 	public createPropertyDatasetContext(host: UmbControllerHost) {
-		return new UmbBlockElementPropertyDatasetContext(host, this);
+		return new UmbBlockElementPropertyDatasetContext(host, this, this.getVariantId());
 	}
 
 	public setup(host: UmbClassInterface) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts
index df6f8b00e4..8daff7f3fb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts
@@ -7,13 +7,14 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
 import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
-import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
+import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 
 export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase implements UmbPropertyDatasetContext {
 	#elementManager: UmbBlockElementManager;
 	public getVariantId() {
 		return this.#elementManager.getVariantId();
 	}
+	#variantId: UmbVariantId;
 
 	#readOnly = new UmbBooleanState(false);
 	public readOnly = this.#readOnly.asObservable();
@@ -32,31 +33,18 @@ export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase imp
 	}
 	readonly name: Observable<string | undefined> = 'TODO: get label observable' as any;
 
-	constructor(host: UmbControllerHost, elementManager: UmbBlockElementManager) {
+	constructor(host: UmbControllerHost, elementManager: UmbBlockElementManager, variantId?: UmbVariantId) {
 		// The controller alias, is a very generic name cause we want only one of these for this controller host.
 		super(host, UMB_PROPERTY_DATASET_CONTEXT.toString());
 		this.#elementManager = elementManager;
-
-		// Niels: I think this should be implemented in the Block Element Manager...
-		/*
-		this.observe(
-			this.#elementManager.readOnlyState.states,
-			(states) => {
-				const isReadOnly = states.some(
-					(state) => state.unique.startsWith('UMB_CULTURE_') && state.variantId.equal(this.#variantId),
-				);
-
-				this.#currentVariantCultureIsReadOnly.setValue(isReadOnly);
-			},
-			'umbObserveReadOnlyStates',
-		);
-		*/
+		this.#variantId = variantId ?? UmbVariantId.CreateInvariant();
 
 		this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (workspace) => {
 			this.observe(
-				workspace.readOnlyState.isOn,
-				(value) => {
-					this.#readOnly.setValue(value);
+				workspace.readOnlyState.states,
+				(states) => {
+					const isReadOnly = states.some((state) => state.variantId.equal(this.#variantId));
+					this.#readOnly.setValue(isReadOnly);
 				},
 				'umbObserveReadOnlyStates',
 			);
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 71165e88af..732fe70cce 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
@@ -141,10 +141,10 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 			// TODO: Ideally we move this into the Block Manager [NL] To avoid binding the Block Manager to a Property...
 			// If the current property is readonly all inner block content should also be readonly.
 			this.observe(
-				context.isReadOnly,
-				(isReadOnly) => {
+				observeMultiple([context.isReadOnly, this.variantId]),
+				([isReadOnly, variantId]) => {
 					const unique = 'UMB_PROPERTY_CONTEXT';
-					const variantId = this.#variantId.getValue();
+					console.log('make states', variantId);
 					if (variantId === undefined) return;
 
 					if (isReadOnly) {