diff --git a/src/displayapp/screens/Alarm.cpp b/src/displayapp/screens/Alarm.cpp
index b1e673639a..7dbc9b5f02 100644
--- a/src/displayapp/screens/Alarm.cpp
+++ b/src/displayapp/screens/Alarm.cpp
@@ -186,6 +186,9 @@ bool Alarm::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
 }
 
 void Alarm::OnValueChanged() {
+  if (alarmController.IsAlerting()) {
+    StopAlerting();
+  }
   DisableAlarm();
   UpdateAlarmTime();
 }