diff --git a/src/panels/lovelace/common/validate-condition.ts b/src/panels/lovelace/common/validate-condition.ts index cea0baec88..9f200e1d48 100644 --- a/src/panels/lovelace/common/validate-condition.ts +++ b/src/panels/lovelace/common/validate-condition.ts @@ -191,6 +191,9 @@ export function extractConditionEntityIds( const entityIds = new Set(); for (const condition of conditions) { if (condition.condition === "numeric_state") { + if (condition.entity) { + entityIds.add(condition.entity); + } if ( typeof condition.above === "string" && isValidEntityId(condition.above) @@ -204,6 +207,9 @@ export function extractConditionEntityIds( entityIds.add(condition.below); } } else if (condition.condition === "state") { + if (condition.entity) { + entityIds.add(condition.entity); + } [ ...(ensureArray(condition.state) ?? []), ...(ensureArray(condition.state_not) ?? []), @@ -304,8 +310,8 @@ export function addEntityToCondition( condition.condition === "numeric_state" ) { return { - ...condition, entity: entityId, + ...condition, }; } return condition;