diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py
index d13580ec42a..3fab39f56ec 100644
--- a/homeassistant/components/group/__init__.py
+++ b/homeassistant/components/group/__init__.py
@@ -16,6 +16,7 @@ from homeassistant.helpers.entity import Entity, async_generate_entity_id
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_state_change
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.config_validation import ENTITY_SERVICE_SCHEMA
 from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from .reproduce_state import async_reproduce_states  # noqa
@@ -45,8 +46,7 @@ SERVICE_REMOVE = 'remove'
 
 CONTROL_TYPES = vol.In(['hidden', None])
 
-SET_VISIBILITY_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
+SET_VISIBILITY_SERVICE_SCHEMA = ENTITY_SERVICE_SCHEMA.extend({
     vol.Required(ATTR_VISIBLE): cv.boolean
 })