diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
index e447904bd..db9e04df1 100644
--- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
@@ -155,7 +155,6 @@ public class TrackDataHub {
         }
 
         started = false;
-        trackStatisticsUpdater = null;
 
         //Unregister listeners
         ContentResolver contentResolver = context.getContentResolver();
@@ -168,6 +167,7 @@ public class TrackDataHub {
             handlerThread = null;
         }
         handler = null;
+        trackStatisticsUpdater = null;
     }
 
     public void loadTrack(final @NonNull Track.Id trackId) {