diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt
index 93588750..d07b4c52 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt
@@ -460,7 +460,7 @@ class MediaPlayerManager(
         // We can't just use play(0,0) then all random playlists will start with the first track.
         // Additionally the shuffle order becomes clear on after some time, so we need to wait for
         // the right event, and can start playback only then.
-        if (autoPlay) {
+        if (autoPlay && controller?.isPlaying != true) {
             if (isShufflePlayEnabled) {
                 deferredPlay = {
                     val start = controller?.currentTimeline
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/DownloadHandler.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/DownloadHandler.kt
index 207c9141..a0b4c156 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/DownloadHandler.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/DownloadHandler.kt
@@ -169,7 +169,7 @@ class DownloadHandler(
         )
 
         if (Settings.shouldTransitionOnPlayback &&
-            (insertionMode == MediaPlayerManager.InsertionMode.CLEAR || autoPlay)
+            insertionMode == MediaPlayerManager.InsertionMode.CLEAR
         ) {
             fragment.findNavController().popBackStack(R.id.playerFragment, true)
             fragment.findNavController().navigate(R.id.playerFragment)