diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.context.ts
index c650135b90..462fedad3e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.context.ts
@@ -7,12 +7,9 @@ import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
  * This is a very simplified workspace context, just to serve one for the imitated property type workspace. (As its not a real workspace)
  */
 export class UmbPropertyTypeWorkspaceContext extends UmbBaseController implements UmbWorkspaceContextInterface {
-	#id: string;
-
-	constructor(host: UmbControllerHostElement, id: string) {
+	constructor(host: UmbControllerHostElement) {
 		// TODO: We don't need a repo here, so maybe we should not require this of the UmbEditableWorkspaceContextBase
 		super(host, 'UmbWorkspaceContext');
-		this.#id = id;
 	}
 
 	get workspaceAlias() {
@@ -20,7 +17,7 @@ export class UmbPropertyTypeWorkspaceContext extends UmbBaseController implement
 	}
 
 	getEntityId() {
-		return this.#id;
+		return undefined;
 	}
 
 	getEntityType() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.element.ts
index d62121cc7e..09f62b17aa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.element.ts
@@ -49,6 +49,8 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
 
 	protected _originalPropertyData!: UmbPropertySettingsModalValue;
 
+	#context = new UmbPropertyTypeWorkspaceContext(this);
+
 	connectedCallback(): void {
 		super.connectedCallback();
 
@@ -68,7 +70,6 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
 		});
 
 		this._originalPropertyData = this.value;
-		new UmbPropertyTypeWorkspaceContext(this, this.value.id);
 
 		const regEx = this.value.validation?.regEx ?? null;
 		if (regEx) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-element.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-element.element.ts
index f144c91b25..103d8d5456 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-element.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-element.element.ts
@@ -1,4 +1,4 @@
-import { property, state } from '@umbraco-cms/backoffice/external/lit';
+import { property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { UmbModalContext } from '@umbraco-cms/backoffice/modal';
 import type { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
@@ -37,7 +37,7 @@ export abstract class UmbModalBaseElement<
 	}
 	#modalContext?: UmbModalContext<ModalDataType, ModalValueType> | undefined;
 
-	@property({ type: Object, attribute: false })
+	@property({ attribute: false })
 	public get data(): ModalDataType | undefined {
 		return this._data;
 	}
@@ -46,7 +46,7 @@ export abstract class UmbModalBaseElement<
 	}
 	private _data?: ModalDataType | undefined;
 
-	@state()
+	@property({ attribute: false })
 	public get value(): ModalValueType {
 		return this.#value;
 	}