diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts index 07b99cb22d..661334392d 100644 --- a/src/panels/lovelace/common/generate-lovelace-config.ts +++ b/src/panels/lovelace/common/generate-lovelace-config.ts @@ -59,7 +59,7 @@ const splitByAreaDevice = ( for (const entity of Object.values(entityEntries)) { const areaId = entity.area_id || - (entity.device_id && deviceEntries[entity.device_id].area_id); + (entity.device_id && deviceEntries[entity.device_id]?.area_id); if (areaId && areaId in areaEntries && entity.entity_id in allEntities) { if (!(areaId in areasWithEntities)) { areasWithEntities[areaId] = [];