diff --git a/homeassistant/components/heos/__init__.py b/homeassistant/components/heos/__init__.py
index a71d0d2de50..a4db978a39d 100644
--- a/homeassistant/components/heos/__init__.py
+++ b/homeassistant/components/heos/__init__.py
@@ -82,7 +82,9 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
     async def disconnect_controller(event):
         await controller.disconnect()
 
-    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, disconnect_controller)
+    entry.async_on_unload(
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, disconnect_controller)
+    )
 
     # Get players and sources
     try: