diff --git a/automations.yaml b/automations.yaml
index 0b13141..c2aa210 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -210,7 +210,9 @@
   trigger:
   - platform: state
     entity_id: group.adults
-    from: not_home
+    not_from:
+      - unknown
+      - unavailable
     to: home
   condition:
   - condition: not
@@ -246,7 +248,9 @@
   trigger:
   - platform: state
     entity_id: group.adults
-    from: home
+    not_from:
+      - unknown
+      - unavailable
     to: not_home
   condition:
   - condition: state
diff --git a/packages/security.yaml b/packages/security.yaml
index d30eebc..8596e59 100644
--- a/packages/security.yaml
+++ b/packages/security.yaml
@@ -374,6 +374,9 @@ automation:
         id: leave-radius
       - platform: state
         entity_id: group.adults
+        not_from:
+          - 'unknown'
+          - 'unavailable'
         to: 'home'
         id: arrive-home
     condition:
@@ -415,7 +418,6 @@ automation:
     trigger:
       - platform: state
         entity_id: alarm_control_panel.stratton_ave_alarm
-        from: armed_home
         to: disarmed
     action:
       - service: input_boolean.turn_off