diff --git a/homeassistant/components/discovery.py b/homeassistant/components/discovery.py
index b2aa5b890a8..01ef36b778b 100644
--- a/homeassistant/components/discovery.py
+++ b/homeassistant/components/discovery.py
@@ -84,7 +84,8 @@ CONF_IGNORE = 'ignore'
 CONFIG_SCHEMA = vol.Schema({
     vol.Required(DOMAIN): vol.Schema({
         vol.Optional(CONF_IGNORE, default=[]):
-            vol.All(cv.ensure_list, [vol.In(SERVICE_HANDLERS)])
+            vol.All(cv.ensure_list, [
+                vol.In(list(CONFIG_ENTRY_HANDLERS) + list(SERVICE_HANDLERS))])
     }),
 }, extra=vol.ALLOW_EXTRA)