diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 56bf9273e1..9feeadedd9 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -461,12 +461,11 @@ void SystemTask::UpdateMotion() {
         (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) &&
          motionController.CurrentShakeSpeed() > settingsController.GetShakeThreshold())) {
       GoToRunning();
+    } else if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::LowerWrist) &&
+               state == SystemTaskState::Running && motionController.ShouldLowerSleep()) {
+      GoToSleep();
     }
   }
-  if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::LowerWrist) && state == SystemTaskState::Running &&
-      motionController.ShouldLowerSleep()) {
-    GoToSleep();
-  }
 }
 
 void SystemTask::HandleButtonAction(Controllers::ButtonActions action) {