diff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java
index 569b14f27..3bf97bd44 100644
--- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java
+++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java
@@ -309,6 +309,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
     public void onDestroy() {
         super.onDestroy();
         Log.d(TAG, "Service is about to be destroyed");
+        disableSleepTimer();
 
         if (notificationBuilder.getPlayerStatus() == PlayerStatus.PLAYING) {
             notificationBuilder.setPlayerStatus(PlayerStatus.STOPPED);
@@ -1222,7 +1223,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
     }
 
     public void disableSleepTimer() {
-        if (sleepTimerActive()) {
+        if (sleepTimer != null) {
             Log.d(TAG, "Disabling sleep timer");
             sleepTimer.stop();
         }