From 9d0fc0d51356a8b28b838133b55b4d63f0337e44 Mon Sep 17 00:00:00 2001
From: David Bonnes <zxdavb@bonnes.me>
Date: Wed, 28 May 2025 17:52:51 +0100
Subject: [PATCH] Fix HOMEASSISTANT_STOP unsubscribe in data update coordinator
 (#145809)

* initial commit

* a better approach

* Add comment
---
 homeassistant/helpers/update_coordinator.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/homeassistant/helpers/update_coordinator.py b/homeassistant/helpers/update_coordinator.py
index 7130264eb0d..bd85391f98f 100644
--- a/homeassistant/helpers/update_coordinator.py
+++ b/homeassistant/helpers/update_coordinator.py
@@ -138,6 +138,8 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_DataT]):
 
         async def _on_hass_stop(_: Event) -> None:
             """Shutdown coordinator on HomeAssistant stop."""
+            # Already cleared on EVENT_HOMEASSISTANT_STOP, via async_fire_internal
+            self._unsub_shutdown = None
             await self.async_shutdown()
 
         self._unsub_shutdown = self.hass.bus.async_listen_once(