diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusManager.java b/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusManager.java
index 121814783..dd9543786 100644
--- a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatusManager.java
@@ -61,6 +61,7 @@ class GpsStatusManager {
      * The client that uses GpsStatus has to call this method to stop the Runnable if needed.
      */
     public void stop() {
+        stopTimer();
         client.onGpsStatusChanged(GpsStatusValue.GPS_NONE);
         client = null;
         handler = null;