diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
index fa08848b2..55a63a511 100644
--- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
@@ -78,7 +78,6 @@ public class TrackDataHub {
 
     private EGM2008Utils.EGM2008Correction egm2008Correction;
 
-    private boolean started;
     //TODO Check if this is needed.
     private HandlerThread handlerThread;
     private Handler handler;
@@ -114,11 +113,10 @@ public class TrackDataHub {
     }
 
     public void start() {
-        if (started) {
+        if (isStarted()) {
             Log.i(TAG, "TrackDataHub already started, ignoring start.");
             return;
         }
-        started = true;
         handlerThread = new HandlerThread(TAG);
         handlerThread.start();
         handler = new Handler(handlerThread.getLooper());
@@ -151,13 +149,11 @@ public class TrackDataHub {
     }
 
     public void stop() {
-        if (!started) {
+        if (!isStarted()) {
             Log.i(TAG, "TrackDataHub not started, ignoring stop.");
             return;
         }
 
-        started = false;
-
         //Unregister listeners
         ContentResolver contentResolver = context.getContentResolver();
         contentResolver.unregisterContentObserver(tracksTableObserver);
@@ -191,7 +187,7 @@ public class TrackDataHub {
     public void registerTrackDataListener(final TrackDataListener trackDataListener) {
         handler.post(() -> {
             listeners.add(trackDataListener);
-            if (started) {
+            if (isStarted()) {
                 loadDataForListener(trackDataListener);
             }
         });
@@ -431,6 +427,10 @@ public class TrackDataHub {
         trackStatisticsUpdater = new TrackStatisticsUpdater();
     }
 
+    private boolean isStarted() {
+        return handlerThread != null;
+    }
+
     public void setRecordingStatus(TrackRecordingService.RecordingStatus recordingStatus) {
         this.recordingStatus = recordingStatus;
     }