diff --git a/app/src/data/entities/Entity.ts b/app/src/data/entities/Entity.ts
index 4b14f5d..0a285e7 100644
--- a/app/src/data/entities/Entity.ts
+++ b/app/src/data/entities/Entity.ts
@@ -158,7 +158,7 @@ export class Entity<
    }
 
    get label(): string {
-      return snakeToPascalWithSpaces(this.config.name ?? this.name);
+      return snakeToPascalWithSpaces(this.config.name || this.name);
    }
 
    field(name: string): Field | undefined {
diff --git a/app/src/ui/modules/data/components/schema/create-modal/step.entity.fields.tsx b/app/src/ui/modules/data/components/schema/create-modal/step.entity.fields.tsx
index 54b4f2e..c2a0a27 100644
--- a/app/src/ui/modules/data/components/schema/create-modal/step.entity.fields.tsx
+++ b/app/src/ui/modules/data/components/schema/create-modal/step.entity.fields.tsx
@@ -1,5 +1,5 @@
 import { typeboxResolver } from "@hookform/resolvers/typebox";
-import type { Static } from "core/utils";
+import { type Static, objectCleanEmpty } from "core/utils";
 import { type TAppDataEntityFields, entitiesSchema } from "data/data-schema";
 import { mergeWith } from "lodash-es";
 import { useRef } from "react";
@@ -20,13 +20,15 @@ export function StepEntityFields() {
    const entity = state.entities?.create?.[0]!;
    const defaultFields = { id: { type: "primary", name: "id" } } as const;
    const ref = useRef<EntityFieldsFormRef>(null);
-   const initial = mergeWith(entity, {
-      fields: defaultFields,
-      config: {
-         sort_field: "id",
-         sort_dir: "asc"
-      }
-   });
+   const initial = objectCleanEmpty(
+      mergeWith(entity, {
+         fields: defaultFields,
+         config: {
+            sort_field: "id",
+            sort_dir: "asc"
+         }
+      })
+   );
    const {
       control,
       formState: { isValid, errors },