diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/shared/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/shared/property-editor-config.element.ts
index ce92891a4d..1bb0cc03cf 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/shared/property-editor-config.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/shared/property-editor-config.element.ts
@@ -27,7 +27,7 @@ export class UmbPropertyEditorConfigElement extends UmbContextConsumerMixin(LitE
 	public data: Array<any> = [];
 
 	@state()
-	private _properties?: Array<any> = [];
+	private _properties: Array<any> = [];
 
 	private _propertyEditorConfigStore?: UmbPropertyEditorConfigStore;
 	private _propertyEditorConfigSubscription?: Subscription;
@@ -49,22 +49,29 @@ export class UmbPropertyEditorConfigElement extends UmbContextConsumerMixin(LitE
 		this._propertyEditorConfigSubscription = this._propertyEditorConfigStore
 			?.getByAlias(this.propertyEditorAlias)
 			.subscribe((propertyEditorConfig) => {
+				if (!propertyEditorConfig) return;
 				this._properties = propertyEditorConfig?.properties;
 			});
 	}
 
 	render() {
 		return html`
-			${this._properties?.map(
-				(property) => html`
-					<umb-entity-property
-						label="${property.label}"
-						description="${property.description}"
-						alias="${property.alias}"
-						property-editor-ui-alias="${property.propertyEditorUI}"
-						.value=${this.data.find((data) => data.alias === property.alias)?.value}></umb-entity-property>
-				`
-			)}
+			<uui-box headline="Config">
+				${this._properties.length > 0
+					? html`
+							${this._properties?.map(
+								(property) => html`
+									<umb-entity-property
+										label="${property.label}"
+										description="${property.description}"
+										alias="${property.alias}"
+										property-editor-ui-alias="${property.propertyEditorUI}"
+										.value=${this.data.find((data) => data.alias === property.alias)?.value}></umb-entity-property>
+								`
+							)}
+					  `
+					: html` <div>No configuration</div> `}
+			</uui-box>
 		`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts
index 2cbe9cfda7..94f2401d0c 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts
@@ -279,11 +279,9 @@ export class UmbEditorViewDataTypeEditElement extends UmbContextConsumerMixin(Li
 		return html`
 			${this._propertyEditorAlias
 				? html`
-						<uui-box headline="Config">
-							<umb-property-editor-config
-								property-editor-alias="${this._propertyEditorAlias}"
-								.data="${this._data}"></umb-property-editor-config>
-						</uui-box>
+						<umb-property-editor-config
+							property-editor-alias="${this._propertyEditorAlias}"
+							.data="${this._data}"></umb-property-editor-config>
 				  `
 				: nothing}
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/property-editor.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/domains/property-editor.handlers.ts
index 4206a4b924..00c6fe81f3 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/domains/property-editor.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/domains/property-editor.handlers.ts
@@ -27,7 +27,7 @@ export const handlers = [
 		if (!alias) return;
 
 		const propertyEditorConfig = umbPropertyEditorConfigData.getByAlias(alias);
-
-		return res(ctx.status(200), ctx.json([propertyEditorConfig]));
+		const response = propertyEditorConfig ? [propertyEditorConfig] : [];
+		return res(ctx.status(200), ctx.json(response));
 	}),
 ];