diff --git a/src/modules/virtual/Timer/Timer.cpp b/src/modules/virtual/Timer/Timer.cpp
index 9a8e28e6..aad43c5e 100644
--- a/src/modules/virtual/Timer/Timer.cpp
+++ b/src/modules/virtual/Timer/Timer.cpp
@@ -28,8 +28,8 @@ class Timer : public IoTItem {
 
     void doByInterval() {
         if (!_unfin && value.valD >= 0 && !_pause) {
+            if (_repeat && value.valD == 0) value.valD = _initValue;
             value.valD--;
-            if (_repeat && value.valD == -1) value.valD = _initValue;
             if (_needSave) needSave = true;
             if (value.valD == 0) {
                 regEvent(value.valD, "Time's up");