From 74fe1f820c4857214fa82ddadb05af4a907aa95b Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 19 Nov 2019 13:16:55 +0100
Subject: [PATCH] Fix error when no entities (#4244)

---
 src/panels/config/scene/ha-scene-editor.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts
index 2cccfe1ad2..3bba0b85d8 100644
--- a/src/panels/config/scene/ha-scene-editor.ts
+++ b/src/panels/config/scene/ha-scene-editor.ts
@@ -515,6 +515,9 @@ export class HaSceneEditor extends SubscribeMixin(LitElement) {
     }
     this._devices = [...this._devices, device];
     const deviceEntities = this._deviceEntityLookup[device];
+    if (!deviceEntities) {
+      return;
+    }
     this._entities = [...this._entities, ...deviceEntities];
     deviceEntities.forEach((entityId) => {
       this._storeState(entityId);
@@ -526,6 +529,9 @@ export class HaSceneEditor extends SubscribeMixin(LitElement) {
     const deviceId = (ev.target as any).device;
     this._devices = this._devices.filter((device) => device !== deviceId);
     const deviceEntities = this._deviceEntityLookup[deviceId];
+    if (!deviceEntities) {
+      return;
+    }
     this._entities = this._entities.filter(
       (entityId) => !deviceEntities.includes(entityId)
     );