diff --git a/homeassistant/components/ssdp/__init__.py b/homeassistant/components/ssdp/__init__.py
index 5e130a0fc06..75ffac772f6 100644
--- a/homeassistant/components/ssdp/__init__.py
+++ b/homeassistant/components/ssdp/__init__.py
@@ -392,7 +392,9 @@ class Scanner:
 
         await self._async_start_ssdp_listeners()
 
-        self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.async_stop)
+        self.hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_STOP, self.async_stop, run_immediately=True
+        )
         self._cancel_scan = async_track_time_interval(
             self.hass, self.async_scan, SCAN_INTERVAL, name="SSDP scanner"
         )
@@ -752,9 +754,13 @@ class Server:
     async def async_start(self) -> None:
         """Start the server."""
         bus = self.hass.bus
-        bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.async_stop)
         bus.async_listen_once(
-            EVENT_HOMEASSISTANT_STARTED, self._async_start_upnp_servers
+            EVENT_HOMEASSISTANT_STOP, self.async_stop, run_immediately=True
+        )
+        bus.async_listen_once(
+            EVENT_HOMEASSISTANT_STARTED,
+            self._async_start_upnp_servers,
+            run_immediately=True,
         )
 
     async def _async_get_instance_udn(self) -> str: