diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 4f6381789b..f69cd63268 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -410,7 +410,7 @@ void DisplayApp::Refresh() {
           // LoadNewScreen(Apps::Sleep, DisplayApp::FullRefreshDirections::None);
         }
         // motorController.RunForDuration(infiniSleepController.gradualWakeVibrationDurations[-1 + infiniSleepController.gradualWakeStep]);
-        
+
         if (infiniSleepController.isSnoozing == false) {
           motorController.GradualWakeBuzz();
           NRF_LOG_INFO("Gradual wake triggered");
diff --git a/src/displayapp/screens/Sleep.cpp b/src/displayapp/screens/Sleep.cpp
index e91ac4abc5..b3a99b4ea2 100644
--- a/src/displayapp/screens/Sleep.cpp
+++ b/src/displayapp/screens/Sleep.cpp
@@ -88,6 +88,10 @@ void Sleep::Refresh() {
 }
 
 void Sleep::UpdateDisplay() {
+  if (lastDisplayState == displayState && displayState == SleepDisplayState::Alarm) {
+    return;
+  }
+
   // Clear the screen
   lv_obj_clean(lv_scr_act());
   if (infiniSleepController.IsAlerting()) {
@@ -528,6 +532,7 @@ void Sleep::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
 
       OnValueChanged();
       infiniSleepController.ScheduleWakeAlarm();
+      SetSwitchState(LV_ANIM_OFF);
       return;
     }
   }