diff --git a/src/components/infinisleep/InfiniSleepController.cpp b/src/components/infinisleep/InfiniSleepController.cpp
index 1e1a78cb2c..acfd189d61 100644
--- a/src/components/infinisleep/InfiniSleepController.cpp
+++ b/src/components/infinisleep/InfiniSleepController.cpp
@@ -55,8 +55,6 @@ void InfiniSleepController::Init(System::SystemTask* systemTask) {
 }
 
 void InfiniSleepController::EnableTracker() {
-  prevBrightnessLevel = brightnessController.Level();
-  brightnessController.Set(BrightnessController::Levels::Low);
   // DisableTracker();
   NRF_LOG_INFO("[InfiniSleepController] Enabling tracker");
   isEnabled = true;
@@ -66,7 +64,6 @@ void InfiniSleepController::EnableTracker() {
 }
 
 void InfiniSleepController::DisableTracker() {
-  brightnessController.Set(prevBrightnessLevel);
   NRF_LOG_INFO("[InfiniSleepController] Disabling tracker");
   xTimerStop(trackerUpdateTimer, 0);
   isEnabled = false;
diff --git a/src/components/infinisleep/InfiniSleepController.h b/src/components/infinisleep/InfiniSleepController.h
index 53cf0b0ac2..c913abcb96 100644
--- a/src/components/infinisleep/InfiniSleepController.h
+++ b/src/components/infinisleep/InfiniSleepController.h
@@ -205,6 +205,10 @@ namespace Pinetime {
         return (9 - gradualWakeStep) + 1;
       }
 
+      BrightnessController& GetBrightnessController() {
+        return brightnessController;
+      }
+
     private:
       bool isAlerting = false;
       bool isGradualWakeAlerting = false;
diff --git a/src/displayapp/screens/Sleep.cpp b/src/displayapp/screens/Sleep.cpp
index a2df141aa1..b1e54550a0 100644
--- a/src/displayapp/screens/Sleep.cpp
+++ b/src/displayapp/screens/Sleep.cpp
@@ -59,6 +59,11 @@ Sleep::Sleep(Controllers::InfiniSleepController& infiniSleepController,
     lv_task_create(PressesToStopAlarmTimeoutCallback, PUSHES_TO_STOP_ALARM_TIMEOUT * 1000, LV_TASK_PRIO_MID, this);
   infiniSleepController.infiniSleepSettings.sleepCycleDuration = 90;
   infiniSleepController.SetSettingsChanged();
+
+  if (!infiniSleepController.IsEnabled()) {
+    infiniSleepController.prevBrightnessLevel = infiniSleepController.GetBrightnessController().Level();
+  }
+  infiniSleepController.GetBrightnessController().Set(Controllers::BrightnessController::Levels::Low);
 }
 
 Sleep::~Sleep() {
@@ -73,6 +78,9 @@ Sleep::~Sleep() {
   lv_obj_clean(lv_scr_act());
   infiniSleepController.SaveWakeAlarm();
   infiniSleepController.SaveInfiniSleepSettings();
+  if (!infiniSleepController.IsEnabled()) {
+    infiniSleepController.GetBrightnessController().Set(infiniSleepController.prevBrightnessLevel);
+  }
 }
 
 void Sleep::DisableWakeAlarm() {