diff --git a/config/packages/modules/lighting/areas/hallway.yaml b/config/packages/modules/lighting/areas/hallway.yaml
index 66be345..db95fe9 100644
--- a/config/packages/modules/lighting/areas/hallway.yaml
+++ b/config/packages/modules/lighting/areas/hallway.yaml
@@ -2,7 +2,7 @@ automation:
   - alias: Lighting · Hallway · Motion On
     trigger:
       platform: state
-      entity_id: group.hallway_motion
+      entity_id: binary_sensor.hallway_motion_occupancy
       to: "on"
     condition:
       condition: state
@@ -35,8 +35,9 @@ automation:
   - alias: Lighting · Hallway · Motion Off
     trigger:
       platform: state
-      entity_id: group.hallway_motion
+      entity_id: binary_sensor.hallway_motion_occupancy
       to: "off"
+      for: "00:01:00"
     action:
       - choose:
         # Turn off in Day Mode