diff --git a/homeassistant/components/igd/__init__.py b/homeassistant/components/igd/__init__.py
index d9c6ad1408c..37445350fa6 100644
--- a/homeassistant/components/igd/__init__.py
+++ b/homeassistant/components/igd/__init__.py
@@ -21,7 +21,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType, HomeAssistantType
 from homeassistant.util import get_local_ip
 from homeassistant.components.discovery import DOMAIN as DISCOVERY_DOMAIN
-import homeassistant.components.igd.config_flow  # noqa: 401
 
 from .const import (
     CONF_ENABLE_PORT_MAPPING, CONF_ENABLE_SENSORS,
@@ -29,7 +28,7 @@ from .const import (
 )
 from .const import DOMAIN
 from .const import LOGGER as _LOGGER
-from .const import ensure_domain_data
+from .config_flow import ensure_domain_data
 
 
 REQUIREMENTS = ['async-upnp-client==0.12.4']
diff --git a/homeassistant/components/igd/config_flow.py b/homeassistant/components/igd/config_flow.py
index c66241d3b78..6f0cec12b5b 100644
--- a/homeassistant/components/igd/config_flow.py
+++ b/homeassistant/components/igd/config_flow.py
@@ -9,7 +9,19 @@ from .const import (
     CONF_SSDP_DESCRIPTION, CONF_UDN
 )
 from .const import DOMAIN
-from .const import ensure_domain_data
+
+
+def ensure_domain_data(hass):
+    """Ensure hass.data is filled properly."""
+    hass.data[DOMAIN] = hass.data.get(DOMAIN, {})
+    hass.data[DOMAIN]['devices'] = hass.data[DOMAIN].get('devices', {})
+    hass.data[DOMAIN]['sensors'] = hass.data[DOMAIN].get('sensors', {})
+    hass.data[DOMAIN]['discovered'] = hass.data[DOMAIN].get('discovered', {})
+    hass.data[DOMAIN]['auto_config'] = hass.data[DOMAIN].get('auto_config', {
+        'active': False,
+        'port_forward': False,
+        'sensors': False,
+    })
 
 
 @config_entries.HANDLERS.register(DOMAIN)
diff --git a/homeassistant/components/igd/const.py b/homeassistant/components/igd/const.py
index 58092cdf38f..47ff9f11074 100644
--- a/homeassistant/components/igd/const.py
+++ b/homeassistant/components/igd/const.py
@@ -8,16 +8,3 @@ CONF_ENABLE_PORT_MAPPING = 'port_forward'
 CONF_ENABLE_SENSORS = 'sensors'
 CONF_UDN = 'udn'
 CONF_SSDP_DESCRIPTION = 'ssdp_description'
-
-
-def ensure_domain_data(hass):
-    """Ensure hass.data is filled properly."""
-    hass.data[DOMAIN] = hass.data.get(DOMAIN, {})
-    hass.data[DOMAIN]['devices'] = hass.data[DOMAIN].get('devices', {})
-    hass.data[DOMAIN]['sensors'] = hass.data[DOMAIN].get('sensors', {})
-    hass.data[DOMAIN]['discovered'] = hass.data[DOMAIN].get('discovered', {})
-    hass.data[DOMAIN]['auto_config'] = hass.data[DOMAIN].get('auto_config', {
-        'active': False,
-        'port_forward': False,
-        'sensors': False,
-    })