proper initialization
diff --git a/homeassistant/components/sensor/tellduslive.py b/homeassistant/components/sensor/tellduslive.py
index ae05ce47e195ab..364b790ce6f03e 100644
--- a/homeassistant/components/sensor/tellduslive.py
+++ b/homeassistant/components/sensor/tellduslive.py
@@ -18,7 +18,6 @@
 ATTR_LAST_UPDATED = "time_last_updated"
 
 _LOGGER = logging.getLogger(__name__)
-DEPENDENCIES = ['tellduslive']
 
 SENSOR_TYPE_TEMP = "temp"
 SENSOR_TYPE_HUMIDITY = "humidity"
@@ -43,6 +42,8 @@
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """ Sets up Tellstick sensors. """
+    if discovery_info is None:
+        return
     sensors = tellduslive.NETWORK.get_sensors()
     devices = []
 
diff --git a/homeassistant/components/switch/tellduslive.py b/homeassistant/components/switch/tellduslive.py
index d515dcb50a29cc..b6c7af3ce12aba 100644
--- a/homeassistant/components/switch/tellduslive.py
+++ b/homeassistant/components/switch/tellduslive.py
@@ -15,11 +15,12 @@
 from homeassistant.helpers.entity import ToggleEntity
 
 _LOGGER = logging.getLogger(__name__)
-DEPENDENCIES = ['tellduslive']
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """ Find and return Tellstick switches. """
+    if discovery_info is None:
+        return
     switches = tellduslive.NETWORK.get_switches()
     add_devices([TelldusLiveSwitch(switch["name"],
                                    switch["id"])

fix issue where sensors and switches were duplicated because of component getting initialized twice. closes #913
