diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
index 7201af376..1154ba99d 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
@@ -43,6 +43,7 @@ class LocationHandler implements LocationListener, GpsStatus.GpsStatusListener {
     }
 
     public void onStop() {
+        lastTrackPoint = null;
         if (locationManager != null) {
             locationManager.removeUpdates(this);
             locationManager = null;