diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 98aac4a91..bbe00d83b 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -88,7 +88,6 @@ public class TrackRecordingService extends Service {
     private Handler handler;
     private LocationManagerConnector locationManagerConnector;
     private PeriodicTaskExecutor voiceExecutor;
-    private SharedPreferences sharedPreferences;
     private TrackRecordingServiceNotificationManager notificationManager;
     private LocationListenerPolicy locationListenerPolicy;
 
@@ -144,9 +143,10 @@ public class TrackRecordingService extends Service {
     };
 
     // The following variables are set when recording:
-    private TripStatisticsUpdater trackTripStatisticsUpdater;
     private WakeLock wakeLock;
     private BluetoothRemoteSensorManager remoteSensorManager;
+
+    private TripStatisticsUpdater trackTripStatisticsUpdater;
     private Location lastLocation;
     private boolean currentSegmentHasLocation;
     private boolean isIdle;
@@ -204,15 +204,15 @@ public class TrackRecordingService extends Service {
         handler = new Handler();
         locationManagerConnector = new LocationManagerConnector(this, handler.getLooper());
         voiceExecutor = new PeriodicTaskExecutor(this, new AnnouncementPeriodicTaskFactory());
-        sharedPreferences = PreferencesUtils.getSharedPreferences(this);
-        sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
+
+
         notificationManager = new TrackRecordingServiceNotificationManager(this);
 
         // onSharedPreferenceChanged might not set recordingTrackId.
         recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
 
-        // Require voiceExecutor and splitExecutor to be created.
-        sharedPreferenceChangeListener.onSharedPreferenceChanged(sharedPreferences, null);
+        PreferencesUtils.register(this, sharedPreferenceChangeListener);
+        sharedPreferenceChangeListener.onSharedPreferenceChanged(null, null);
 
         handler.post(registerLocationRunnable);
 
@@ -252,8 +252,7 @@ public class TrackRecordingService extends Service {
         handler.removeCallbacks(registerLocationRunnable);
         unregisterLocationListener();
 
-        // unregister sharedPreferences before shutting down splitExecutor and voiceExecutor
-        sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
+        PreferencesUtils.unregister(this, sharedPreferenceChangeListener);
 
         try {
             voiceExecutor.shutdown();
@@ -385,10 +384,7 @@ public class TrackRecordingService extends Service {
         trackTripStatisticsUpdater = new TripStatisticsUpdater(tripStatistics.getStartTime());
 
         try (TrackPointIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY)) {
-            while (locationIterator.hasNext()) {
-                Location location = locationIterator.next();
-                trackTripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
-            }
+            trackTripStatisticsUpdater.addLocation(locationIterator, recordingDistanceInterval);
         } catch (RuntimeException e) {
             Log.e(TAG, "RuntimeException", e);
         }
@@ -435,7 +431,13 @@ public class TrackRecordingService extends Service {
         voiceExecutor.restore();
     }
 
-    void startGps() {
+    void tryStartGps() {
+        if (isRecording()) return;
+
+        startGps();
+    }
+
+    private void startGps() {
         wakeLock = SystemUtils.acquireWakeLock(this, wakeLock);
         registerLocationListener();
         showNotification(true);
@@ -523,13 +525,15 @@ public class TrackRecordingService extends Service {
     /**
      * Stops gps.
      *
-     * @param stop true to stop self
+     * @param shutdown true to shutdown self
      */
-    void stopGps(boolean stop) {
+    void stopGps(boolean shutdown) {
+        if (!isRecording()) return;
+
         unregisterLocationListener();
         showNotification(false);
         wakeLock = SystemUtils.releaseWakeLock(wakeLock);
-        if (stop) {
+        if (shutdown) {
             stopSelf();
         }
     }
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceBinder.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceBinder.java
index 542ecd563..b3411d3d5 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceBinder.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceBinder.java
@@ -24,15 +24,12 @@ class TrackRecordingServiceBinder extends android.os.Binder implements TrackReco
 
     @Override
     public void startGps() {
-        if (!trackRecordingService.isRecording()) {
-            trackRecordingService.startGps();
-        }
+        trackRecordingService.tryStartGps();
+
     }
 
     public void stopGps() {
-        if (!trackRecordingService.isRecording()) {
-            trackRecordingService.stopGps(true);
-        }
+        trackRecordingService.stopGps(true);
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/stats/TripStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/stats/TripStatisticsUpdater.java
index 9f33fef4c..1e46da463 100644
--- a/src/main/java/de/dennisguse/opentracks/stats/TripStatisticsUpdater.java
+++ b/src/main/java/de/dennisguse/opentracks/stats/TripStatisticsUpdater.java
@@ -21,6 +21,7 @@ import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
+import de.dennisguse.opentracks.content.provider.TrackPointIterator;
 import de.dennisguse.opentracks.util.LocationUtils;
 
 import static de.dennisguse.opentracks.services.TrackRecordingService.MAX_NO_MOVEMENT_SPEED;
@@ -178,6 +179,13 @@ public class TripStatisticsUpdater {
         lastMovingLocation = location;
     }
 
+    public void addLocation(TrackPointIterator iterator, int minRecordingDistance) {
+        while (iterator.hasNext()) {
+            Location location = iterator.next();
+            addLocation(location, minRecordingDistance);
+        }
+    }
+
     /**
      * Gets the smoothed elevation over several readings.
      * The elevation readings is noisy so the smoothed elevation is better than the raw elevation for many tasks.