diff --git a/homeassistant/components/config/__init__.py b/homeassistant/components/config/__init__.py
index 0366dfa2b8b..7807c527370 100644
--- a/homeassistant/components/config/__init__.py
+++ b/homeassistant/components/config/__init__.py
@@ -46,7 +46,6 @@ async def async_setup(hass, config):
         if success:
             key = '{}.{}'.format(DOMAIN, panel_name)
             hass.bus.async_fire(EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: key})
-            hass.config.components.add(key)
 
     @callback
     def component_loaded(event):
diff --git a/tests/components/config/test_init.py b/tests/components/config/test_init.py
index 57ea7e7a492..41a0fb089b5 100644
--- a/tests/components/config/test_init.py
+++ b/tests/components/config/test_init.py
@@ -29,7 +29,6 @@ def test_load_on_demand_already_loaded(hass, aiohttp_client):
         yield from async_setup_component(hass, 'config', {})
 
     yield from hass.async_block_till_done()
-    assert 'config.zwave' in hass.config.components
     assert stp.called
 
 
@@ -47,5 +46,4 @@ def test_load_on_demand_on_load(hass, aiohttp_client):
         hass.bus.async_fire(EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: 'zwave'})
         yield from hass.async_block_till_done()
 
-    assert 'config.zwave' in hass.config.components
     assert stp.called