diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index 4fdb1a097..7be830780 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -92,14 +92,14 @@
                             </label>
                         </div>
                     </div>
+                </div>
 
-                    <div class="checkboxListContainer">
-                        <div class="checkboxList">
-                            <label>
-                                <input type="checkbox" is="emby-checkbox" id="chkAllowHevcEncoding" />
-                                <span>${AllowHevcEncoding}</span>
-                            </label>
-                        </div>
+                <div class="checkboxListContainer">
+                    <div class="checkboxList">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkAllowHevcEncoding" />
+                            <span>${AllowHevcEncoding}</span>
+                        </label>
                     </div>
                 </div>
 
@@ -211,11 +211,13 @@
                     </select>
                     <div class="fieldDescription">${EncoderPresetHelp}</div>
                 </div>
+                <div class="inputContainer">
+                    <input is="emby-input" type="number" id="txtH265Crf" pattern="[0-9]*" min="0" max="51" step="1" label="${LabelH265Crf}" />
+                </div>
                 <div class="inputContainer">
                     <input is="emby-input" type="number" id="txtH264Crf" pattern="[0-9]*" min="0" max="51" step="1" label="${LabelH264Crf}" />
                     <div class="fieldDescription">${H264CrfHelp}</div>
                 </div>
-
                 <div class="selectContainer">
                     <select is="emby-select" id="selectDeinterlaceMethod" label="${LabelDeinterlaceMethod}">
                         <option value="yadif">${Yadif}</option>
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 48b31e4dc..5edde3a85 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -31,6 +31,7 @@ import libraryMenu from 'libraryMenu';
         page.querySelector('#txtTonemappingParam').value = config.TonemappingParam || '';
         page.querySelector('#selectEncoderPreset').value = config.EncoderPreset || '';
         page.querySelector('#txtH264Crf').value = config.H264Crf || '';
+        page.querySelector('#txtH265Crf').value = config.H265Crf || '';
         page.querySelector('#selectDeinterlaceMethod').value = config.DeinterlaceMethod || '';
         page.querySelector('#chkDoubleRateDeinterlacing').checked = config.DeinterlaceDoubleRate;
         page.querySelector('#chkEnableSubtitleExtraction').checked = config.EnableSubtitleExtraction || false;
@@ -87,6 +88,7 @@ import libraryMenu from 'libraryMenu';
                 config.TonemappingParam = form.querySelector('#txtTonemappingParam').value || '0';
                 config.EncoderPreset = form.querySelector('#selectEncoderPreset').value;
                 config.H264Crf = parseInt(form.querySelector('#txtH264Crf').value || '0');
+                config.H265Crf = parseInt(form.querySelector('#txtH265Crf').value || '0');
                 config.DeinterlaceMethod = form.querySelector('#selectDeinterlaceMethod').value;
                 config.DeinterlaceDoubleRate = form.querySelector('#chkDoubleRateDeinterlacing').checked;
                 config.EnableSubtitleExtraction = form.querySelector('#chkEnableSubtitleExtraction').checked;
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 23cead75b..58334e69a 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -252,7 +252,7 @@
     "Guide": "Guide",
     "GuideProviderLogin": "Login",
     "GuideProviderSelectListings": "Select Listings",
-    "H264CrfHelp": "The Constant Rate Factor (CRF) is the default quality setting for the x264 encoder. You can set the values between 0 and 51, where lower values would result in better quality (at the expense of higher file sizes). Sane values are between 18 and 28. The default for x264 is 23, so you can use this as a starting point.",
+    "H264CrfHelp": "The Constant Rate Factor (CRF) is the default quality setting for the x264 and x265 encoder. You can set the values between 0 and 51, where lower values would result in better quality (at the expense of higher file sizes). Sane values are between 18 and 28. The default for x264 is 23, and for x265 is 28, so you can use this as a starting point.",
     "EncoderPresetHelp": "Choose a faster value to improve performance, or a slower value to improve quality.",
     "HDPrograms": "HD programs",
     "HardwareAccelerationWarning": "Enabling hardware acceleration may cause instability in some environments. Ensure that your operating system and video drivers are fully up to date. If you have difficulty playing video after enabling this, you'll need to change the setting back to None.",
@@ -589,7 +589,8 @@
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies in a collection will be displayed as one grouped item.",
     "LabelH264Crf": "H264 encoding CRF:",
-    "LabelEncoderPreset": "H264 and H265 encoding preset:",
+    "LabelH265Crf": "H265 encoding CRF:",
+    "LabelEncoderPreset": "Encoding preset:",
     "LabelHardwareAccelerationType": "Hardware acceleration:",
     "LabelHardwareAccelerationTypeHelp": "Hardware acceleration requires additional configuration.",
     "LabelHomeNetworkQuality": "Home network quality:",
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index af8d036da..fbdd1696c 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -197,7 +197,7 @@
     "GuestStar": "特邀明星",
     "GuideProviderLogin": "登入",
     "GuideProviderSelectListings": "选择列表",
-    "H264CrfHelp": "The Constant Rate Factor (CRF) 是 x264 编码器的默认质量设置。您可以设置介于0和51之间的值, 其中较低的值将导致更好的质量 (以更高的文件大小为代价)。正常值介于18和28之间。x264 的默认值为 23, 因此可以将其用作起始点。",
+    "H264CrfHelp": "The Constant Rate Factor (CRF) 是 x264 编码器的默认质量设置。您可以设置介于0和51之间的值， 其中较低的值将导致更好的质量 (以更高的文件大小为代价)。正常值介于 18 和 28 之间。x264 的默认值为 23，x265 的默认值为 28，因此可以将其用作起始点。",
     "EncoderPresetHelp": "选择一个更快的值以提升性能，或者选择一个更慢的值以提升质量。",
     "HDPrograms": "高清节目",
     "HardwareAccelerationWarning": "启动硬件加速可能在某些环境下导致系统不稳定。请确认你的操作系统和显卡驱动程序是最新的。如果你在开启此项后播放视频时遇到困难，那么你需要将此选项设置回“没有”。",
@@ -493,7 +493,8 @@
     "LabelGroupMoviesIntoCollections": "批量添加电影到集合",
     "LabelGroupMoviesIntoCollectionsHelp": "显示电影列表时，同一集合的电影将显示为一个分组。",
     "LabelH264Crf": "H264 CRF 编码质量等级：",
-    "LabelEncoderPreset": "H264 和 H265 编码预设：",
+    "LabelH265Crf": "H265 CRF 编码质量等级：",
+    "LabelEncoderPreset": "编码预设：",
     "LabelHardwareAccelerationType": "硬件加速：",
     "LabelHardwareAccelerationTypeHelp": "硬件加速需要额外配置。",
     "LabelHomeNetworkQuality": "家庭网络质量：",