diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 66c4716ac..386b0e0e8 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -708,17 +708,7 @@ public class TrackRecordingService extends Service {
     }
 
     private void showNotification(boolean isGpsStarted) {
-        // Dijkstra If
-        if (isRecording() && isPaused()) {
-            stopForeground(true);
-            notificationManager.cancelNotification();
-
-        }
-        if (!isRecording() && !isGpsStarted) {
-            stopForeground(true);
-            notificationManager.cancelNotification();
-        }
-        if (isRecording() && !isPaused()) {
+        if (isRecording()) {
             Intent intent = IntentUtils.newIntent(this, TrackDetailActivity.class)
                     .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, recordingTrackId);
             PendingIntent pendingIntent = TaskStackBuilder.create(this)
@@ -740,5 +730,9 @@ public class TrackRecordingService extends Service {
             notificationManager.updateContent(getString(R.string.gps_starting));
             startForeground(TrackRecordingServiceNotificationManager.NOTIFICATION_ID, notificationManager.getNotification());
         }
+        if (!isRecording() && !isGpsStarted) {
+            stopForeground(true);
+            notificationManager.cancelNotification();
+        }
     }
 }