diff --git a/homeassistant/components/binary_sensor/homematic.py b/homeassistant/components/binary_sensor/homematic.py
index d2005f99ba5..acbc2eafe69 100644
--- a/homeassistant/components/binary_sensor/homematic.py
+++ b/homeassistant/components/binary_sensor/homematic.py
@@ -55,6 +55,8 @@ SUPPORT_HM_EVENT_AS_BINMOD = [
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMBinarySensor,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/homematic.py b/homeassistant/components/homematic.py
index 040a15a368e..3bc23bbdb71 100644
--- a/homeassistant/components/homematic.py
+++ b/homeassistant/components/homematic.py
@@ -21,7 +21,6 @@ from homeassistant.const import EVENT_HOMEASSISTANT_STOP, \
     ATTR_SERVICE, \
     ATTR_DISCOVERED, \
     STATE_UNKNOWN
-from homeassistant.loader import get_component
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
 import homeassistant.bootstrap
@@ -150,10 +149,8 @@ def system_callback_handler(hass, config, src, *args):
                 # When devices of this type are found
                 # they are setup in HA and an event is fired
                 if found_devices:
-                    component = get_component(component_name)
-
                     # HA discovery event
-                    discovery.load_platform(hass, component, DOMAIN, {
+                    discovery.load_platform(hass, component_name, DOMAIN, {
                         ATTR_DISCOVER_DEVICES: found_devices
                     }, config)
 
diff --git a/homeassistant/components/light/homematic.py b/homeassistant/components/light/homematic.py
index 94dabb0f00a..6ccc2f636ba 100644
--- a/homeassistant/components/light/homematic.py
+++ b/homeassistant/components/light/homematic.py
@@ -29,6 +29,8 @@ DEPENDENCIES = ['homematic']
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMLight,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/rollershutter/homematic.py b/homeassistant/components/rollershutter/homematic.py
index e0dd5e5469f..55a86be0bf6 100644
--- a/homeassistant/components/rollershutter/homematic.py
+++ b/homeassistant/components/rollershutter/homematic.py
@@ -29,6 +29,8 @@ DEPENDENCIES = ['homematic']
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMRollershutter,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/sensor/homematic.py b/homeassistant/components/sensor/homematic.py
index 52ece78f59e..c07faedbf5b 100644
--- a/homeassistant/components/sensor/homematic.py
+++ b/homeassistant/components/sensor/homematic.py
@@ -41,6 +41,8 @@ HM_UNIT_HA_CAST = {
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMSensor,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/switch/homematic.py b/homeassistant/components/switch/homematic.py
index 5a630f43022..ca639b95ecb 100644
--- a/homeassistant/components/switch/homematic.py
+++ b/homeassistant/components/switch/homematic.py
@@ -28,6 +28,8 @@ DEPENDENCIES = ['homematic']
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMSwitch,
                                                   config,
                                                   add_callback_devices)
diff --git a/homeassistant/components/thermostat/homematic.py b/homeassistant/components/thermostat/homematic.py
index a1ed06bc4bd..d98b674c692 100644
--- a/homeassistant/components/thermostat/homematic.py
+++ b/homeassistant/components/thermostat/homematic.py
@@ -28,6 +28,8 @@ _LOGGER = logging.getLogger(__name__)
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMThermostat,
                                                   config,
                                                   add_callback_devices)