diff --git a/homeassistant/helpers/restore_state.py b/homeassistant/helpers/restore_state.py
index 2d6ffb9ec49..7979247c8b0 100644
--- a/homeassistant/helpers/restore_state.py
+++ b/homeassistant/helpers/restore_state.py
@@ -253,7 +253,7 @@ class RestoreStateData:
 
         # Dump states when stopping hass
         self.hass.bus.async_listen_once(
-            EVENT_HOMEASSISTANT_STOP, _async_dump_states_at_stop
+            EVENT_HOMEASSISTANT_STOP, _async_dump_states_at_stop, run_immediately=True
         )
 
     @callback