diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java
index 7246063b1..e937ef44e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java
@@ -240,7 +240,8 @@ public class TrackWriter {
         wroteSegment = false;
       }
       if (wroteTrack) {
-        trackFormatWriter.writeEndTrack(locationFactory.lastLocation);
+        Location lastValidTrackPoint = myTracksProviderUtils.getLastValidTrackPoint(track.getId());
+        trackFormatWriter.writeEndTrack(lastValidTrackPoint);
       } else {
         // Write an empty track
         trackFormatWriter.writeBeginTrack(null);