diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py index 3fe0c0eb086..d397764c1be 100644 --- a/homeassistant/helpers/service.py +++ b/homeassistant/helpers/service.py @@ -487,9 +487,11 @@ def async_extract_referenced_entity_ids( # Find devices for targeted areas selected.referenced_devices.update(selector.device_ids) - for device_entry in dev_reg.devices.values(): - if device_entry.area_id in selector.area_ids: - selected.referenced_devices.add(device_entry.id) + + if selector.area_ids: + for device_entry in dev_reg.devices.values(): + if device_entry.area_id in selector.area_ids: + selected.referenced_devices.add(device_entry.id) if not selector.area_ids and not selected.referenced_devices: return selected