diff --git a/packages/security/security.yaml b/packages/security/security.yaml
index e7b3dd6..4c3a169 100644
--- a/packages/security/security.yaml
+++ b/packages/security/security.yaml
@@ -867,7 +867,7 @@ automation:
                   title: Garage Door Cancelled
                   message: "Garage door timeout cancelled because alarm was disarmed"
 
-          - conditions: "{{ 'completed' not in wait or not wait.completed }}"
+          - conditions: "{{ 'remaining' not in wait or not wait.remaining }}"
             sequence:
               - alias: Close garage door
                 action: switch.turn_on
@@ -1008,7 +1008,7 @@ automation:
                   title: Front Door Cancelled
                   message: Front door timeout cancelled because alarm was disarmed
 
-          - conditions: "{{ not wait.completed }}"
+          - conditions: "{{ 'remaining' not in wait or not wait.remaining }}"
             sequence:
               - alias: Lock front door
                 action: lock.lock