diff --git a/homeassistant/setup.py b/homeassistant/setup.py
index 186d5d6b75c..45e3b328fc3 100644
--- a/homeassistant/setup.py
+++ b/homeassistant/setup.py
@@ -601,11 +601,14 @@ def _async_when_setup(
             EVENT_COMPONENT_LOADED,
             _matched_event,
             event_filter=_async_is_component_filter,
+            run_immediately=True,
         )
     )
     if start_event:
         listeners.append(
-            hass.bus.async_listen(EVENT_HOMEASSISTANT_START, _matched_event)
+            hass.bus.async_listen(
+                EVENT_HOMEASSISTANT_START, _matched_event, run_immediately=True
+            )
         )