diff --git a/homeassistant/components/wemo.py b/homeassistant/components/wemo.py
index fb1cc4e77d3eb6875f44d244731dd338e960f1c9..9dc144266a8bfd84f90e3c038d6e1666cf3cbb0f 100644
--- a/homeassistant/components/wemo.py
+++ b/homeassistant/components/wemo.py
@@ -25,6 +25,7 @@ WEMO_MODEL_DISPATCH = {
     'Maker':   DISCOVER_SWITCHES,
     'Motion':  DISCOVER_MOTION,
     'Socket':  DISCOVER_SWITCHES,
+    'LightSwitch': DISCOVER_SWITCHES
 }
 WEMO_SERVICE_DISPATCH = {
     DISCOVER_LIGHTS: 'light',
@@ -64,12 +65,11 @@ def setup(hass, config):
             return
         KNOWN_DEVICES.append(mac)
 
-        service = WEMO_MODEL_DISPATCH.get(model_name)
+        service = WEMO_MODEL_DISPATCH.get(model_name) or DISCOVER_SWITCHES
         component = WEMO_SERVICE_DISPATCH.get(service)
 
-        if service is not None:
-            discovery.discover(hass, service, discovery_info,
-                               component, config)
+        discovery.discover(hass, service, discovery_info,
+                           component, config)
 
     discovery.listen(hass, discovery.SERVICE_WEMO, discovery_dispatch)