diff --git a/src/core/timer.c b/src/core/timer.c
index 03935eea949..133cbb974de 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -431,6 +431,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
 
                                 if (base <= 0)
                                         continue;
+                                base = MAX(base, t->last_trigger.monotonic);
 
                                 break;
 
@@ -443,6 +444,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
 
                                 if (base <= 0)
                                         continue;
+                                base = MAX(base, t->last_trigger.monotonic);
 
                                 break;