diff --git a/custom_components/adaptive_lighting/manifest.json b/custom_components/adaptive_lighting/manifest.json
index c6ac3cd6..4ac645d0 100644
--- a/custom_components/adaptive_lighting/manifest.json
+++ b/custom_components/adaptive_lighting/manifest.json
@@ -6,7 +6,7 @@
   "config_flow": true,
   "dependencies": [],
   "codeowners": ["@basnijholt", "@RubenKelevra"],
-  "version": "1.0.17",
+  "version": "1.0.18",
   "requirements": [],
   "iot_class": "calculated"
 }
diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index 00555ef0..5eb29a9a 100755
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -1291,6 +1291,11 @@ class TurnOnOffListener:
                 _LOGGER.debug(
                     "Found entity_ids '%s' for area_id '%s'", entity_ids, area_id
                 )
+        else:
+            _LOGGER.debug(
+                "No entity_ids or area_ids found in service_data: %s", service_data
+            )
+            return
 
         if not any(eid in self.lights for eid in entity_ids):
             return