diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 8d466a892ec..acb790d6915 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -100,6 +100,7 @@ async def async_setup_hass(
 ) -> core.HomeAssistant | None:
     """Set up Home Assistant."""
     hass = core.HomeAssistant()
+    core._cv_hass.set(hass)  # pylint: disable=protected-access
     hass.config.config_dir = runtime_config.config_dir
 
     async_enable_logging(
@@ -187,8 +188,6 @@ async def async_setup_hass(
     if runtime_config.open_ui:
         hass.add_job(open_hass_ui, hass)
 
-    core._cv_hass.set(hass)  # pylint: disable=protected-access
-
     return hass
 
 
diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
index 06f800af7f3..56c15f49337 100644
--- a/tests/test_bootstrap.py
+++ b/tests/test_bootstrap.py
@@ -501,6 +501,8 @@ async def test_setup_hass(
     assert len(mock_ensure_config_exists.mock_calls) == 1
     assert len(mock_process_ha_config_upgrade.mock_calls) == 1
 
+    assert hass == core.async_get_hass()
+
 
 async def test_setup_hass_takes_longer_than_log_slow_startup(
     mock_enable_logging,