diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index 68583c840..fb6291234 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -677,6 +677,11 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                     writePlayerStatusPlaybackPreferences();
                     break;
 
+                case STOPPED:
+                    writePlaybackPreferencesNoMediaPlaying();
+                    stopSelf();
+                    break;
+
                 case PLAYING:
                     writePlayerStatusPlaybackPreferences();
                     setupNotification(newInfo);
@@ -689,7 +694,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                     }
                     break;
 
-                case ERROR: case STOPPED:
+                case ERROR:
                     writePlaybackPreferencesNoMediaPlaying();
                     stopSelf();
                     break;