diff --git a/Community/Tdarr_Plugin_076a_re_order_audio_streams.js b/Community/Tdarr_Plugin_076a_re_order_audio_streams.js
index d7ecbf7..8186923 100644
--- a/Community/Tdarr_Plugin_076a_re_order_audio_streams.js
+++ b/Community/Tdarr_Plugin_076a_re_order_audio_streams.js
@@ -116,11 +116,14 @@ const plugin = (file, librarySettings, inputs, otherArguments) => {
     }
   }
 
-  ffmpegCommand += ` -map 0:a:${streamIdx} -disposition:a:${streamIdx} default`;
+  ffmpegCommand += ` -map 0:a:${streamIdx} -disposition:a:0 default`;
 
   for (var i = 0; i < allAudioTracks.length; i++) {
     if (i !== streamIdx) {
-      ffmpegCommand += ` -map 0:a:${i} -disposition:a:${i} none `;
+      ffmpegCommand += ` -map 0:a:${i} `;
+    }
+    if (i !== 0) {
+      ffmpegCommand += ` -disposition:a:${i} 0 `;
     }
   }
 
diff --git a/Community/Tdarr_Plugin_076b_re_order_subtitle_streams.js b/Community/Tdarr_Plugin_076b_re_order_subtitle_streams.js
index 30d8107..620cfea 100644
--- a/Community/Tdarr_Plugin_076b_re_order_subtitle_streams.js
+++ b/Community/Tdarr_Plugin_076b_re_order_subtitle_streams.js
@@ -119,11 +119,14 @@ const plugin = (file, librarySettings, inputs, otherArguments) => {
     }
   }
 
-  ffmpegCommand += ` -map 0:s:${streamIdx} -disposition:s:${streamIdx} default`;
+  ffmpegCommand += ` -map 0:s:${streamIdx} -disposition:s:0 default`;
 
   for (var i = 0; i < allSubtitleTracks.length; i++) {
     if (i !== streamIdx) {
-      ffmpegCommand += ` -map 0:s:${i} -disposition:a:${i} none `;
+      ffmpegCommand += ` -map 0:s:${i} `;
+    }
+    if (i !== 0) {
+      ffmpegCommand += ` -disposition:s:${i} 0 `;
     }
   }