From 79f5ec0cd57474fc8f00b9fa33115b59dfb9c2ce Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Thu, 30 Nov 2023 11:59:31 +0100
Subject: [PATCH] Fix dashboard crashed when deleting hidden area (#18832)

---
 src/data/area_registry.ts                              | 4 ++--
 src/panels/lovelace/common/generate-lovelace-config.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/area_registry.ts b/src/data/area_registry.ts
index b3c391b56a..769c02c97e 100644
--- a/src/data/area_registry.ts
+++ b/src/data/area_registry.ts
@@ -130,8 +130,8 @@ export const areaCompare =
     const indexA = order ? order.indexOf(a) : -1;
     const indexB = order ? order.indexOf(b) : 1;
     if (indexA === -1 && indexB === -1) {
-      const nameA = entries?.[a].name ?? a;
-      const nameB = entries?.[b].name ?? b;
+      const nameA = entries?.[a]?.name ?? a;
+      const nameB = entries?.[b]?.name ?? b;
       return stringCompare(nameA, nameB);
     }
     if (indexA === -1) {
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index 56c7b3ced8..43de72c3ff 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -476,7 +476,7 @@ export const generateDefaultViewConfig = (
 
   if (areasPrefs?.hidden) {
     for (const area of areasPrefs.hidden) {
-      splittedByAreaDevice.areasWithEntities[area] = [];
+      delete splittedByAreaDevice.areasWithEntities[area];
     }
   }