diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 5ce0e715e..d055098a1 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -502,16 +502,6 @@ public class PlaybackController {
             PlaybackServiceMediaPlayer.PSMPInfo info = playbackService.getPSMPInfo();
             status = info.playerStatus;
             media = info.playable;
-            /*
-            if (media == null) {
-                Log.w(TAG,
-                        "PlaybackService has no media object. Trying to restore last played media.");
-                Intent serviceIntent = getPlayLastPlayedMediaIntent();
-                if (serviceIntent != null) {
-			        ContextCompat.startForegroundService(activity, serviceIntent);
-                }
-            }
-            */
             onServiceQueried();
 
             setupGUI();
@@ -719,7 +709,8 @@ public class PlaybackController {
     }
 
     public boolean canDownmix() {
-        return playbackService != null && playbackService.canDownmix();
+        return (playbackService != null && playbackService.canDownmix())
+                || UserPreferences.useSonic();
     }
 
     public void setDownmix(boolean enable) {