diff --git a/src/data/floor_registry.ts b/src/data/floor_registry.ts
index 3400af6c99..32de014100 100644
--- a/src/data/floor_registry.ts
+++ b/src/data/floor_registry.ts
@@ -21,7 +21,7 @@ export interface FloorAreaLookup {
 
 export interface FloorRegistryEntryMutableParams {
   name: string;
-  level?: number;
+  level?: number | null;
   icon?: string | null;
   aliases?: string[];
 }
@@ -34,7 +34,7 @@ const fetchFloorRegistry = (conn: Connection) =>
     .then((floors) =>
       (floors as FloorRegistryEntry[]).sort((ent1, ent2) => {
         if (ent1.level !== ent2.level) {
-          return (ent1.level ?? 0) - (ent2.level ?? 0);
+          return (ent1.level ?? 9999) - (ent2.level ?? 9999);
         }
         return stringCompare(ent1.name, ent2.name);
       })
diff --git a/src/panels/config/areas/dialog-floor-registry-detail.ts b/src/panels/config/areas/dialog-floor-registry-detail.ts
index 62fdd1a504..eabd0c03b2 100644
--- a/src/panels/config/areas/dialog-floor-registry-detail.ts
+++ b/src/panels/config/areas/dialog-floor-registry-detail.ts
@@ -24,7 +24,7 @@ class DialogFloorDetail extends LitElement {
 
   @state() private _icon!: string | null;
 
-  @state() private _level!: number;
+  @state() private _level!: number | null;
 
   @state() private _error?: string;
 
@@ -40,7 +40,7 @@ class DialogFloorDetail extends LitElement {
     this._name = this._params.entry ? this._params.entry.name : "";
     this._aliases = this._params.entry?.aliases || [];
     this._icon = this._params.entry?.icon || null;
-    this._level = this._params.entry?.level ?? 0;
+    this._level = this._params.entry?.level ?? null;
     await this.updateComplete;
   }