Don't clear entity_sources when removing an entity which is in the registry

This commit is contained in:
Erik 2025-06-11 21:05:57 +02:00
parent cfb4161635
commit 3d6cfc0018

View File

@ -1424,6 +1424,10 @@ class Entity(
self.registry_entry.write_unavailable_state(self.hass)
else:
self.hass.states.async_remove(self.entity_id, context=self._context)
# The check for self.platform guards against integrations not using an
# EntityComponent and can be removed in HA Core 2024.1
if self.platform:
del entity_sources(self.hass)[self.entity_id]
async def async_added_to_hass(self) -> None:
"""Run when entity about to be added to hass.
@ -1482,10 +1486,6 @@ class Entity(
Not to be extended by integrations.
"""
# The check for self.platform guards against integrations not using an
# EntityComponent and can be removed in HA Core 2024.1
if self.platform:
del entity_sources(self.hass)[self.entity_id]
@callback
def _async_registry_updated(