diff --git a/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino b/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino
index 6686b8770..49342df27 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino
@@ -1458,19 +1458,7 @@ bool findNextVariableValue(char * &pVarname, float &value)
   } else if (sVarName.startsWith(F("TIMER"))) {
     uint32_t index = sVarName.substring(5).toInt();
     if (index > 0 && index <= MAX_TIMERS) {
-      value = Settings->timer[index -1].time;
-#if defined(USE_SUNRISE)
-      // Correct %timerN% values for sunrise/sunset timers
-      if ((1 == Settings->timer[index -1].mode) || (2 == Settings->timer[index -1].mode)) {
-        // in this context, time variable itself is merely an offset, with <720 being negative
-        value += -720 + SunMinutes(Settings->timer[index -1].mode -1);
-        if (2 == Settings->timer[index -1].mode) {
-          // To aid rule comparative statements, sunset past midnight (high lattitudes) is expressed past 24h00
-          // So sunset at 00h45 is at 24h45
-          if (value < 360) { value += 1440; }
-        }
-      }
-#endif  // USE_SUNRISE
+      value = TimerGetTimeOfDay(index -1);
     }
 #if defined(USE_SUNRISE)
   } else if (sVarName.equals(F("SUNRISE"))) {