diff --git a/src/panels/lovelace/common/validate-condition.ts b/src/panels/lovelace/common/validate-condition.ts
index 4606916cfb..ac86fed600 100644
--- a/src/panels/lovelace/common/validate-condition.ts
+++ b/src/panels/lovelace/common/validate-condition.ts
@@ -258,13 +258,12 @@ export function buildConditionForFilter(
 
   // Set the entity to filter on
   if (
-    "condition" in newCondition &&
-    (newCondition.condition === "numeric_state" ||
-      newCondition.condition === "state")
+    ("condition" in newCondition &&
+      (newCondition.condition === "numeric_state" ||
+        newCondition.condition === "state")) ||
+    "operator" in newCondition
   ) {
     newCondition.entity = entityId;
-  } else if ("operator" in newCondition) {
-    newCondition.entity = entityId;
   }
 
   return newCondition;