diff --git a/homeassistant/components/wemo.py b/homeassistant/components/wemo.py
index ab2094ba9d7..93760405e08 100644
--- a/homeassistant/components/wemo.py
+++ b/homeassistant/components/wemo.py
@@ -58,17 +58,17 @@ def coerce_host_port(value):
 
 
 CONF_STATIC = 'static'
-CONF_DISABLE_DISCOVERY = 'disable_discovery'
+CONF_DISCOVERY = 'discovery'
 
-DEFAULT_DISABLE_DISCOVERY = False
+DEFAULT_DISCOVERY = True
 
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
         vol.Optional(CONF_STATIC, default=[]): vol.Schema([
             vol.All(cv.string, coerce_host_port)
         ]),
-        vol.Optional(CONF_DISABLE_DISCOVERY,
-                     default=DEFAULT_DISABLE_DISCOVERY): cv.boolean
+        vol.Optional(CONF_DISCOVERY,
+                     default=DEFAULT_DISCOVERY): cv.boolean
     }),
 }, extra=vol.ALLOW_EXTRA)
 
@@ -141,9 +141,7 @@ def setup(hass, config):
 
         devices.append((url, device))
 
-    disable_discovery = config.get(DOMAIN, {}).get(CONF_DISABLE_DISCOVERY)
-
-    if not disable_discovery:
+    if config.get(DOMAIN, {}).get(CONF_DISCOVERY):
         _LOGGER.debug("Scanning for WeMo devices.")
         devices.extend(
             (setup_url_for_device(device), device)