diff --git a/packages/emmalynn.yaml b/packages/emmalynn.yaml
index f2cffff..7b525ef 100644
--- a/packages/emmalynn.yaml
+++ b/packages/emmalynn.yaml
@@ -976,6 +976,10 @@ script:
           - service: script.stairwell_led_strip
             data:
               brightness: 255
+          - service: adaptive_lighting.set_manual_control
+            data:
+              manual_control: false
+              entity_id: switch.adaptive_lighting_emma_bedroom
         - conditions:
           - condition: state
             entity_id: binary_sensor.early_night_mode
@@ -984,6 +988,17 @@ script:
           - service: light.turn_on
             target:
               entity_id: light.emma_bedroom_light
+          - delay:
+              seconds: 1
+          - service: input_select.select_option
+            target:
+              entity_id: input_select.emma_bedroom_scenes
+            data:
+              option: Adaptive
+          - service: adaptive_lighting.set_manual_control
+            data:
+              manual_control: false
+              entity_id: switch.adaptive_lighting_emma_bedroom
 # Climate
       - choose:
         - conditions:
@@ -1155,6 +1170,12 @@ script:
               5
             {% endif %}
       - choose:
+        - conditions: "{{ wait.trigger == 'adaptive' }}"
+          sequence:
+          - service: adaptive_lighting.set_manual_control
+            data:
+              manual_control: false
+              entity_id: switch.adaptive_lighting_emma_bedroom
         - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
           sequence:
           - service: input_select.select_option
@@ -1162,6 +1183,10 @@ script:
               entity_id: input_select.emma_bedroom_scenes
             data:
               option: Adaptive
+          - service: adaptive_lighting.set_manual_control
+            data:
+              manual_control: false
+              entity_id: switch.adaptive_lighting_emma_bedroom
         - conditions: "{{ wait.trigger.id == 'lights-off' }}"
           sequence:
           - service: switch.turn_on
@@ -1175,6 +1200,10 @@ script:
               entity_id: input_text.emma_bedroom_selected_scene
             data:
               value: Adaptive
+          - service: adaptive_lighting.set_manual_control
+            data:
+              manual_control: false
+              entity_id: switch.adaptive_lighting_emma_bedroom
 # Climate/White Noise
       - service: input_boolean.turn_off
         target:
diff --git a/packages/master_bedroom.yaml b/packages/master_bedroom.yaml
index 9f5befc..a19aeaf 100644
--- a/packages/master_bedroom.yaml
+++ b/packages/master_bedroom.yaml
@@ -127,6 +127,10 @@ script:
             entity_id: input_text.master_bedroom_selected_scene
           data:
             value: Adaptive
+        - service: adaptive_lighting.set_manual_control
+          data:
+            manual_control: false
+            entity_id: switch.adaptive_lighting_master_bedroom
 
   master_bedroom_sleep:
     alias: 'Master Bedroom Sleep'
@@ -147,5 +151,9 @@ script:
         entity_id: input_text.master_bedroom_selected_scene
       data:
         value: Adaptive
+    - service: adaptive_lighting.set_manual_control
+      data:
+        manual_control: false
+        entity_id: switch.adaptive_lighting_master_bedroom
 
 # TODO: Figure out which actions to move here, and which ones to keep in Node-RED
\ No newline at end of file