diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 759c19d7d4..3d4ed0b99b 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -167,6 +167,14 @@
                             <a is="emby-linkbutton" rel="noopener noreferrer" class="button-link" href="http://ffmpeg.org/ffmpeg-all.html#tonemap_005fopencl" target="_blank">${TonemappingAlgorithmHelp}</a>
                         </div>
                     </div>
+                    <div class="selectContainer">
+                        <select is="emby-select" id="selectTonemappingMode" label="${LabelTonemappingMode}">
+                            <option value="auto">${Auto}</option>
+                            <option value="max">MAX</option>
+                            <option value="rgb">RGB</option>
+                        </select>
+                        <div class="fieldDescription">${TonemappingModeHelp}</div>
+                    </div>
                     <div class="selectContainer">
                         <select is="emby-select" id="selectTonemappingRange" label="${LabelTonemappingRange}">
                             <option value="auto">${Auto}</option>
@@ -179,10 +187,6 @@
                         <input is="emby-input" type="number" id="txtTonemappingDesat" pattern="[0-9]*" min="0" max="1.79769e+308" step=".00001" label="${LabelTonemappingDesat}" />
                         <div class="fieldDescription">${LabelTonemappingDesatHelp}</div>
                     </div>
-                    <div class="inputContainer">
-                        <input is="emby-input" type="number" id="txtTonemappingThreshold" pattern="[0-9]*" min="0" max="1.79769e+308" step=".00001" label="${LabelTonemappingThreshold}" />
-                        <div class="fieldDescription">${LabelTonemappingThresholdHelp}</div>
-                    </div>
                     <div class="inputContainer">
                         <input is="emby-input" type="number" id="txtTonemappingPeak" pattern="[0-9]*" min="0" max="1.79769e+308" step=".00001" label="${LabelTonemappingPeak}" />
                         <div class="fieldDescription">${LabelTonemappingPeakHelp}</div>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 38ca954d0e..2ae00b3dec 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -32,9 +32,9 @@ function loadPage(page, config, systemInfo) {
     page.querySelector('#chkTonemapping').checked = config.EnableTonemapping;
     page.querySelector('#chkVppTonemapping').checked = config.EnableVppTonemapping;
     page.querySelector('#selectTonemappingAlgorithm').value = config.TonemappingAlgorithm;
+    page.querySelector('#selectTonemappingMode').value = config.TonemappingMode;
     page.querySelector('#selectTonemappingRange').value = config.TonemappingRange;
     page.querySelector('#txtTonemappingDesat').value = config.TonemappingDesat;
-    page.querySelector('#txtTonemappingThreshold').value = config.TonemappingThreshold;
     page.querySelector('#txtTonemappingPeak').value = config.TonemappingPeak;
     page.querySelector('#txtTonemappingParam').value = config.TonemappingParam || '';
     page.querySelector('#txtVppTonemappingBrightness').value = config.VppTonemappingBrightness;
@@ -90,9 +90,9 @@ function onSubmit() {
             config.EnableTonemapping = form.querySelector('#chkTonemapping').checked;
             config.EnableVppTonemapping = form.querySelector('#chkVppTonemapping').checked;
             config.TonemappingAlgorithm = form.querySelector('#selectTonemappingAlgorithm').value;
+            config.TonemappingMode = form.querySelector('#selectTonemappingMode').value;
             config.TonemappingRange = form.querySelector('#selectTonemappingRange').value;
             config.TonemappingDesat = form.querySelector('#txtTonemappingDesat').value;
-            config.TonemappingThreshold = form.querySelector('#txtTonemappingThreshold').value;
             config.TonemappingPeak = form.querySelector('#txtTonemappingPeak').value;
             config.TonemappingParam = form.querySelector('#txtTonemappingParam').value || '0';
             config.VppTonemappingBrightness = form.querySelector('#txtVppTonemappingBrightness').value;
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index e2b39af691..7a8ce9d8ee 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1706,5 +1706,7 @@
     "MediaInfoElPresentFlag": "DV el preset flag",
     "MediaInfoBlPresentFlag": "DV bl preset flag",
     "MediaInfoDvBlSignalCompatibilityId": "DV bl signal compatibility id",
-    "Unreleased": "Not yet released"
+    "Unreleased": "Not yet released",
+    "LabelTonemappingMode": "Tone mapping mode:",
+    "TonemappingModeHelp": "Select the tone mapping mode. If you experience blown out highlights try switching to the RGB mode."
 }
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index d0ce56c4f8..9a047ed0be 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -1721,5 +1721,7 @@
     "HeaderPerformance": "性能",
     "LabelParallelImageEncodingLimit": "并行图像编码限制",
     "LabelEnableAudioVbr": "启用 VBR 音频编码",
-    "LabelEnableAudioVbrHelp": "可变比特率（VBR）相比平均比特率（ABR）可以提供更好的质量，但在少见情况中可能造成缓冲和兼容性问题。"
+    "LabelEnableAudioVbrHelp": "可变比特率（VBR）相比平均比特率（ABR）可以提供更好的质量，但在少见情况中可能造成缓冲和兼容性问题。",
+    "LabelTonemappingMode": "色调映射模式：",
+    "TonemappingModeHelp": "如果您遇到高光过曝问题，请尝试切换到 RGB 模式。"
 }