diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py index 9f666e86c69..277a93ef4b4 100644 --- a/homeassistant/helpers/entity_registry.py +++ b/homeassistant/helpers/entity_registry.py @@ -1518,7 +1518,9 @@ def _async_setup_entity_restore(hass: HomeAssistant, registry: EntityRegistry) - entry.write_unavailable_state(hass) - hass.bus.async_listen(EVENT_HOMEASSISTANT_START, _write_unavailable_states) + hass.bus.async_listen( + EVENT_HOMEASSISTANT_START, _write_unavailable_states, run_immediately=True + ) async def async_migrate_entries(