diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index e828e7b6e101..1859f5578d75 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -1069,8 +1069,7 @@ ${
         }
         if (
           changedProps.has("_entitySources") ||
-          (changedProps.has("hass") && !oldHass) ||
-          !oldHass.states[entityId]
+          (changedProps.has("hass") && (!oldHass || !oldHass.states[entityId]))
         ) {
           changed = true;
         }