diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 245cc5d46bd..92fe935085a 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -517,7 +517,7 @@ SERVICE_SCHEMA = vol.All(vol.Schema({
     vol.Exclusive('service_template', 'service name'): template,
     vol.Optional('data'): dict,
     vol.Optional('data_template'): {match_all: template_complex},
-    vol.Optional(CONF_ENTITY_ID): entity_ids,
+    vol.Optional(CONF_ENTITY_ID): comp_entity_ids,
 }), has_at_least_one_key('service', 'service_template'))
 
 NUMERIC_STATE_CONDITION_SCHEMA = vol.All(vol.Schema({
diff --git a/tests/helpers/test_config_validation.py b/tests/helpers/test_config_validation.py
index 791570981e2..03dd3cfe55a 100644
--- a/tests/helpers/test_config_validation.py
+++ b/tests/helpers/test_config_validation.py
@@ -332,6 +332,10 @@ def test_service_schema():
             'service': 'homeassistant.turn_on',
             'entity_id': 'light.kitchen',
         },
+        {
+            'service': 'light.turn_on',
+            'entity_id': 'all',
+        },
         {
             'service': 'homeassistant.turn_on',
             'entity_id': ['light.kitchen', 'light.ceiling'],