diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 96d77b398..fc686c6bb 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -120,11 +120,12 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
 
     @Override
     public void onDestroy() {
+        trackPointCreator.stop();
+        trackPointCreator = null;
+
         handler.removeCallbacksAndMessages(null); //Some tests do not finish the recording completely
         handler = null;
 
-        trackPointCreator.stop();
-        trackPointCreator = null;
         trackRecordingManager.stop();
         trackRecordingManager = null;