diff --git a/lib/statemachine.dart b/lib/statemachine.dart
index 43ebff5..a07fab2 100644
--- a/lib/statemachine.dart
+++ b/lib/statemachine.dart
@@ -254,7 +254,8 @@ class StateMachine {
               if (WI == WarnIntervals.NONE) continue;
 
               if (WI.seconds >= sec &&
-                  WI.seconds <= current.seconds &&
+                  (current == WarnIntervals.NONE ||
+                      WI.seconds <= current.seconds) &&
                   WI != current) {
                 current = WI;
                 send = true;