diff --git a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
index c5a738f6d..4e63ee457 100644
--- a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
+++ b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
@@ -176,10 +176,13 @@ namespace lms::api::subsonic
                 bitrate = maxBitRate;
             }
 
+            // Need to transcode here
             if (!requestedFormat)
                 requestedFormat = userTranscodeFormatToAvFormat(context.user->getSubsonicDefaultTranscodingOutputFormat());
             if (!bitrate)
-                bitrate = std::min<std::size_t>(context.user->getSubsonicDefaultTranscodingOutputBitrate(), maxBitRate);
+                bitrate = context.user->getSubsonicDefaultTranscodingOutputBitrate();
+            if (maxBitRate)
+                bitrate = std::min<std::size_t>(bitrate, maxBitRate);
 
             av::transcoding::OutputParameters& outputParameters{ parameters.outputParameters.emplace() };