diff --git a/apps/global/home_alarm.yaml b/apps/global/home_alarm.yaml
index 4530172..cb3c306 100644
--- a/apps/global/home_alarm.yaml
+++ b/apps/global/home_alarm.yaml
@@ -27,7 +27,7 @@ home_alarm:
   reset_button: input_button.alarm_reset
 
   presence_simulation:
-    smart_conditions: input_boolean.simulate_presence #and binary_sensor.home_alarm_armed
+    smart_conditions: input_boolean.simulate_presence and binary_sensor.home_alarm_armed
 
     target_apps:
       restroom:
@@ -54,8 +54,7 @@ home_alarm:
         app: light_living_room
         status_sensor: binary_sensor.home_alarm_presence_mezzanine
         mode: method
-        #smart_conditions: binary_sensor.is_dark_outside
-        smart_conditions: input_boolean.simulate_presence
+        smart_conditions: binary_sensor.is_dark_outside
         time_window:
           stop: '23:30'
           stop_jitter_min: 30