diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 402532e60..4032939a8 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -129,6 +129,10 @@
                     <input is="emby-input" type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" label="${LabelDownMixAudioScale}" />
                     <div class="fieldDescription">${LabelDownMixAudioScaleHelp}</div>
                 </div>
+                <div class="inputContainer">
+                    <input is="emby-input" type="number" id="txtMaxMuxingQueueSize" pattern="[0-9]*" required="required" min="128" max="2147483647" step="1" label="${LabelMaxMuxingQueueSize}" />
+                    <div class="fieldDescription">${LabelMaxMuxingQueueSizeHelp}</div>
+                </div>
 
                 <div class="selectContainer">
                     <select is="emby-select" id="selectEncoderPreset" label="${LabelEncoderPreset}">
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index dfad07618..3398dfcb7 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -16,6 +16,7 @@ import libraryMenu from 'libraryMenu';
         $('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
         $('#selectThreadCount', page).val(config.EncodingThreadCount);
         $('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
+        page.querySelector('#txtMaxMuxingQueueSize').value = config.MaxMuxingQueueSize || '';
         page.querySelector('.txtEncoderPath').value = config.EncoderAppPathDisplay || '';
         $('#txtTranscodingTempPath', page).val(systemInfo.TranscodingTempPath || '');
         $('#txtVaapiDevice', page).val(config.VaapiDevice || '');
@@ -60,6 +61,7 @@ import libraryMenu from 'libraryMenu';
             loading.show();
             ApiClient.getNamedConfiguration('encoding').then(function (config) {
                 config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
+                config.MaxMuxingQueueSize = form.querySelector('#txtMaxMuxingQueueSize').value;
                 config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
                 config.EncodingThreadCount = $('#selectThreadCount', form).val();
                 config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();
diff --git a/src/strings/.en-us.json.swp b/src/strings/.en-us.json.swp
new file mode 100644
index 000000000..bbb5d9ab1
Binary files /dev/null and b/src/strings/.en-us.json.swp differ
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index f87c1a326..d66d29897 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1442,5 +1442,7 @@
     "ClearQueue": "Clear queue",
     "LabelSubtitleVerticalPosition": "Vertical position:",
     "SubtitleVerticalPositionHelp": "Line number where text appears. Positive numbers indicate top down. Negative numbers indicate bottom up.",
-    "Preview": "Preview"
+    "Preview": "Preview",
+    "LabelMaxMuxingQueueSize": "Max muxing queue size:",
+    "LabelMaxMuxingQueueSizeHelp": "Maximum number of packets that can be buffered while waiting for all streams to initialize. Try to increase it if you still encounter \"Too many packets buffered for output stream\" error in ffmpeg logs. The recommended value is 2048."
 }
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index a44b9ab99..d72eb3774 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -1442,5 +1442,7 @@
     "MessagePluginInstallError": "安装插件时出现错误。",
     "NextTrack": "下一曲",
     "LabelUnstable": "不稳定",
-    "PlaybackRate": "播放速率"
+    "PlaybackRate": "播放速率",
+    "LabelMaxMuxingQueueSize": "最大混合器队列大小：",
+    "LabelMaxMuxingQueueSizeHelp": "等待所有流初始化时可缓冲的最大数据包数。如果在 ffmpeg 日志中仍然遇到 \"Too many packets buffered for output stream\" 错误，请尝试增加该值。建议值为 2048。"
 }