diff --git a/apps/drivers/moes_pad.py b/apps/drivers/moes_pad.py
index f6d29f0..0a72795 100644
--- a/apps/drivers/moes_pad.py
+++ b/apps/drivers/moes_pad.py
@@ -75,5 +75,6 @@ class MoesPad(ADBase):
                 self.adapi.call_service('light/toggle', entity_id='light.bedroom_stick')
             case MoesButtons.BOTTOM_RIGHT:
                 for e in ('bedroom_stick', 'bedroom_john', 'bedroom_sydney'):
-                    if self.adapi.get_state(e) == 'on':
-                        self.adapi.call_service('light/toggle', entity_id=e)
+                    eid = f'light.{e}'
+                    if self.adapi.get_state(eid) == 'on':
+                        self.adapi.call_service('light/toggle', entity_id=eid)