diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 1a417a7fbac..1d6fdcf36d4 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -51,13 +51,6 @@ from .components import (
     webhook as webhook_pre_import,  # noqa: F401
     websocket_api as websocket_api_pre_import,  # noqa: F401
 )
-
-# Ensure group config_flow is imported so it does not need the import
-# executor since config_flows are preloaded when the component is loaded.
-# Even though group is pre-imported above we would have still had to wait
-# for the config flow to be imported when the import executor is the most
-# busy.
-from .components.group import config_flow as group_config_flow  # noqa: F401
 from .components.sensor import recorder as sensor_recorder  # noqa: F401
 from .const import (
     FORMAT_DATETIME,
diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py
index 120c2d18290..330eafa110c 100644
--- a/homeassistant/components/group/__init__.py
+++ b/homeassistant/components/group/__init__.py
@@ -31,6 +31,12 @@ from homeassistant.helpers.reload import async_reload_integration_platforms
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
 
+# Ensure group config_flow is imported so it does not need the import
+# executor since config_flows are preloaded when the component is loaded.
+# Even though group is pre-imported above we would have still had to wait
+# for the config flow to be imported when the import executor is the most
+# busy.
+from . import config_flow as config_flow_pre_import  # noqa: F401
 from .const import (  # noqa: F401
     ATTR_ADD_ENTITIES,
     ATTR_ALL,