diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java
index 8335116fc..50bcd85af 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java
@@ -72,11 +72,7 @@ public class TimerTaskExecutor {
       return;
     }
 
-    long now = System.currentTimeMillis();
-    long next = tripStatistics.getStartTime();
-    if (next < now) {
-      next = now + interval - ((now - next) % interval);
-    }
+    long next = System.currentTimeMillis() + interval - (tripStatistics.getTotalTime() % interval);
     timer.scheduleAtFixedRate(new PeriodicTimerTask(), new Date(next), interval);
   }