diff --git a/custom_components/adaptive_lighting/services.yaml b/custom_components/adaptive_lighting/services.yaml
index 10bfd2a8..8f449a77 100755
--- a/custom_components/adaptive_lighting/services.yaml
+++ b/custom_components/adaptive_lighting/services.yaml
@@ -5,7 +5,7 @@ apply:
       description: entity_id of the Adaptive Lighting switch.
       example: switch.adaptive_lighting_default
     lights:
-      description: entity_id(s) of lights.
+      description: "entity_id(s) of lights, default: lights of the switch"
       example: light.bedroom_ceiling
     transition:
       description: Transition of the lights.
diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index ffd8bebd..be877dff 100755
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -322,7 +322,7 @@ async def async_setup_entry(
     platform.async_register_entity_service(
         SERVICE_APPLY,
         {
-            vol.Required(CONF_LIGHTS): cv.entity_ids,
+            vol.Optional(CONF_LIGHTS, default=switch._lights): cv.entity_ids,  # pylint: disable=protected-access
             vol.Optional(
                 CONF_TRANSITION,
                 default=switch._initial_transition,  # pylint: disable=protected-access