diff --git a/src/data/selector.ts b/src/data/selector.ts index 8993e0e5c3..60d2b133fe 100644 --- a/src/data/selector.ts +++ b/src/data/selector.ts @@ -702,10 +702,13 @@ export const deviceMeetsTargetSelector = ( }; export const entityMeetsTargetSelector = ( - entity: HassEntity, + entity: HassEntity | undefined, targetSelector: TargetSelector, entitySources?: EntitySources ): boolean => { + if (!entity) { + return false; + } if (targetSelector.target?.entity) { return ensureArray(targetSelector.target!.entity).some((filterEntity) => filterSelectorEntities(filterEntity, entity, entitySources)