diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts
index 89d2e53c79..9133eaafc3 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts
@@ -116,7 +116,7 @@ export class UmbEditorDataTypeElement extends UmbContextProviderMixin(
 
 			this.observe<DataTypeDetails>(this._dataTypeContext.data, (dataType) => {
 				if (dataType && dataType.name !== this._dataTypeName) {
-					this._dataTypeName = dataType.name;
+					this._dataTypeName = dataType.name ?? '';
 				}
 			});
 		});
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts
index 7151864c06..3231143d01 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts
@@ -1,12 +1,9 @@
-import { Entity } from './entities';
 import { UmbEntityData } from './entity.data';
 import { FolderTreeItem } from '@umbraco-cms/backend-api';
 
-export interface DataTypeEntity extends Entity {
-	type: 'dataType';
-}
-
-export interface DataTypeDetails extends DataTypeEntity {
+export interface DataTypeDetails extends FolderTreeItem {
+	key: string; // TODO: remove when server is fixed
+	isTrashed: boolean; // TODO: remove only temp part of refactor
 	propertyEditorModelAlias: string | null;
 	propertyEditorUIAlias: string | null;
 	data: Array<DataTypePropertyData>;