diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java
index 93ff888df..7558284db 100644
--- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java
+++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java
@@ -126,9 +126,10 @@ public class TrackStatisticsUpdater {
                 if (lastTrackPoint != null && lastMovingTrackPoint != null && lastTrackPoint != lastMovingTrackPoint) {
                     currentSegment.addTotalDistance(lastMovingTrackPoint.distanceTo(lastTrackPoint));
                 }
-                trackStatistics.merge(currentSegment);
             }
+            trackStatistics.merge(currentSegment);
             currentSegment.reset(trackPoint.getTime());
+
             lastTrackPoint = null;
             lastMovingTrackPoint = null;
             elevationBuffer_m.reset();