diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index e9b852ada8d..8352b566afe 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -68,6 +68,7 @@ SERVICE_REMOTE_DISCONNECT = "remote_disconnect"
 
 SIGNAL_CLOUD_CONNECTION_STATE = "CLOUD_CONNECTION_STATE"
 
+STARTUP_REPAIR_DELAY = 1  # 1 hour
 
 ALEXA_ENTITY_SCHEMA = vol.Schema(
     {
@@ -309,7 +310,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     async_call_later(
         hass=hass,
-        delay=timedelta(hours=1),
+        delay=timedelta(hours=STARTUP_REPAIR_DELAY),
         action=async_startup_repairs,
     )
 
diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
index 1ee60b71dad..9f02d6394e0 100644
--- a/tests/test_bootstrap.py
+++ b/tests/test_bootstrap.py
@@ -551,6 +551,7 @@ async def test_setup_hass_takes_longer_than_log_slow_startup(
     assert "Waiting on integrations to complete setup" in caplog.text
 
 
+@patch("homeassistant.components.cloud.STARTUP_REPAIR_DELAY", 0)
 async def test_setup_hass_invalid_yaml(
     mock_enable_logging: Mock,
     mock_is_virtual_env: Mock,
@@ -606,6 +607,7 @@ async def test_setup_hass_config_dir_nonexistent(
     )
 
 
+@patch("homeassistant.components.cloud.STARTUP_REPAIR_DELAY", 0)
 async def test_setup_hass_safe_mode(
     mock_enable_logging: Mock,
     mock_is_virtual_env: Mock,
@@ -640,6 +642,7 @@ async def test_setup_hass_safe_mode(
 
 
 @pytest.mark.parametrize("hass_config", [{"homeassistant": {"non-existing": 1}}])
+@patch("homeassistant.components.cloud.STARTUP_REPAIR_DELAY", 0)
 async def test_setup_hass_invalid_core_config(
     mock_hass_config: None,
     mock_enable_logging: Mock,
@@ -678,6 +681,7 @@ async def test_setup_hass_invalid_core_config(
         }
     ],
 )
+@patch("homeassistant.components.cloud.STARTUP_REPAIR_DELAY", 0)
 async def test_setup_safe_mode_if_no_frontend(
     mock_hass_config: None,
     mock_enable_logging: Mock,