diff --git a/src/HomeAssistant/Controller/Bedroom.hs b/src/HomeAssistant/Controller/Bedroom.hs
index dcbd2ec..d2bf6ed 100644
--- a/src/HomeAssistant/Controller/Bedroom.hs
+++ b/src/HomeAssistant/Controller/Bedroom.hs
@@ -60,11 +60,13 @@ bedroomPresenceController = proc x -> do
          callService (activateScene "scene.makuuhuone_lights_snapshot") -< ()
        Event LightsSleep -> do
          callService createBedroomScene -< ()
+         adaptiveMode -< True
          sleepMode -< True
        _ -> returnA -< ()
 
   where
     sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
+    adaptiveMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot"] )
 
 
 data BedroomControls
@@ -89,33 +91,43 @@ bedroomButtonController = proc x -> do
   case ev of
        Event (Masse (OnButton ShortRelease)) -> do
          sleepMode -< False
+         adaptiveMode -< False
          callService (activateScene "scene.makuuhuone_masse") -< ()
        Event (Masse (OnButton DoubleClick)) -> do
          sleepMode -< False
+         adaptiveMode -< False
          callService (activateScene "scene.makuuhuone_keski") -< ()
        Event (Masse (OnButton LongClick)) -> do
          sleepMode -< False
+         adaptiveMode -< False
          callService (activateScene "scene.makuuhuone_kirkas") -< ()
        Event (Masse (OffButton _)) -> do
          sleepMode -< False
+         adaptiveMode -< False
          callService (light [AreaId "makuuhuone"] Off) -< ()
        Event (Enishen (OnButton ShortRelease)) -> do
          sleepMode -< False
+         adaptiveMode -< False
          callService (activateScene "scene.makuuhuone_jemina") -< ()
        Event (Enishen (OnButton DoubleClick)) -> do
          sleepMode -< False
+         adaptiveMode -< False
          callService (activateScene "scene.makuuhuone_keski") -< ()
        Event (Enishen (OnButton LongClick)) -> do
          sleepMode -< False
+         adaptiveMode -< False
          callService (activateScene "scene.makuuhuone_kirkas") -< ()
        Event (Enishen (OffButton _)) -> do
          sleepMode -< False
+         adaptiveMode -< False
          callService (light [AreaId "makuuhuone"] Off) -< ()
        Event (Central _) -> do
          sleepMode -< False
+         adaptiveMode -< False
        _ -> returnA -< ()
   where
     sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
+    adaptiveMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot"] )