1 files changed, 6 insertions, 5 deletions
diff --git a/src/components/alarm/AlarmController.cpp b/src/components/alarm/AlarmController.cpp
index 0a2231f..93fb284 100644
--- a/src/components/alarm/AlarmController.cpp
+++ b/src/components/alarm/AlarmController.cpp
@@ -50,14 +50,15 @@ void AlarmController::RescheduleAlarm() {
 
   xTimerStop(alarmAppTimer, 0);
   auto now = dateTimeController.CurrentDateTime();
-  alarmTime = now;
-  auto mSecToAlarm = std::chrono::duration_cast<std::chrono::milliseconds>(alarmTime - now).count();
 
-  if (mSecToAlarm < 0) { mSecToAlarm = 0; }
+  if (now > alarmTime) {
+    xTimerChangePeriod(alarmAppTimer, 1, 0);
+  } else {
+    auto mSecToAlarm = std::chrono::duration_cast<std::chrono::milliseconds>(alarmTime - now).count();
+    xTimerChangePeriod(alarmAppTimer, APP_TIMER_TICKS(mSecToAlarm), 0);
+  }
 
-  xTimerChangePeriod(alarmAppTimer, APP_TIMER_TICKS(mSecToAlarm), 0);
   xTimerStart(alarmAppTimer, 0);
-
 }
 
 void AlarmController::ScheduleAlarm() {