diff --git a/homeassistant/components/websocket_api/http.py b/homeassistant/components/websocket_api/http.py
index fc75b46ddbd..83d68ee21ea 100644
--- a/homeassistant/components/websocket_api/http.py
+++ b/homeassistant/components/websocket_api/http.py
@@ -292,7 +292,7 @@ class WebSocketHandler:
         self._handle_task = asyncio.current_task()
 
         unsub_stop = hass.bus.async_listen(
-            EVENT_HOMEASSISTANT_STOP, self._async_handle_hass_stop
+            EVENT_HOMEASSISTANT_STOP, self._async_handle_hass_stop, run_immediately=True
         )
 
         writer = wsock._writer  # pylint: disable=protected-access