diff --git a/src/apps/dashboard/routes/playback/trickplay.tsx b/src/apps/dashboard/routes/playback/trickplay.tsx
index 7f5336575f..ace6586795 100644
--- a/src/apps/dashboard/routes/playback/trickplay.tsx
+++ b/src/apps/dashboard/routes/playback/trickplay.tsx
@@ -31,6 +31,7 @@ const PlaybackTrickplay: FunctionComponent = () => {
         }
 
         (page.querySelector('.chkEnableHwAcceleration') as HTMLInputElement).checked = options.EnableHwAcceleration;
+        (page.querySelector('.chkEnableHwEncoding') as HTMLInputElement).checked = options.EnableHwEncoding;
         (page.querySelector('#selectScanBehavior') as HTMLSelectElement).value = options.ScanBehavior;
         (page.querySelector('#selectProcessPriority') as HTMLSelectElement).value = options.ProcessPriority;
         (page.querySelector('#txtInterval') as HTMLInputElement).value = options.Interval;
@@ -76,6 +77,7 @@ const PlaybackTrickplay: FunctionComponent = () => {
 
             const options = config.TrickplayOptions;
             options.EnableHwAcceleration = (page.querySelector('.chkEnableHwAcceleration') as HTMLInputElement).checked;
+            options.EnableHwEncoding = (page.querySelector('.chkEnableHwEncoding') as HTMLInputElement).checked;
             options.ScanBehavior = (page.querySelector('#selectScanBehavior') as HTMLSelectElement).value as TrickplayScanBehavior;
             options.ProcessPriority = (page.querySelector('#selectProcessPriority') as HTMLSelectElement).value as ProcessPriorityClass;
             options.Interval = Math.max(1, parseInt((page.querySelector('#txtInterval') as HTMLInputElement).value || '10000', 10));
@@ -154,12 +156,16 @@ const PlaybackTrickplay: FunctionComponent = () => {
                             className='chkEnableHwAcceleration'
                             title='LabelTrickplayAccel'
                         />
+                    </div>
+                    <div className='checkboxContainer checkboxContainer-withDescription'>
+                        <CheckBoxElement
+                            className='chkEnableHwEncoding'
+                            title='LabelTrickplayAccelEncoding'
+                        />
                         <div className='fieldDescription checkboxFieldDescription'>
-                            <LinkTrickplayAcceleration
-                                title='LabelTrickplayAccelHelp'
-                                href='#/dashboard/playback/transcoding'
-                                className='button-link'
-                            />
+                            <div className='fieldDescription'>
+                                {globalize.translate('LabelTrickplayAccelEncodingHelp')}
+                            </div>
                         </div>
                     </div>
 
diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index c9dac5e44b..5f0ba1398f 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -135,12 +135,6 @@
                             <span>${AllowAv1Encoding}</span>
                         </label>
                     </div>
-                    <div class="checkboxList">
-                        <label>
-                            <input type="checkbox" is="emby-checkbox" id="chkAllowMjpegEncoding" />
-                            <span>${AllowMjpegEncoding}</span>
-                        </label>
-                    </div>
                 </div>
 
                 <div class="vppTonemappingOptions hide">
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 6e254ced46..4c0f796b6e 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -19,7 +19,6 @@ function loadPage(page, config, systemInfo) {
     page.querySelector('#chkHardwareEncoding').checked = config.EnableHardwareEncoding;
     page.querySelector('#chkAllowHevcEncoding').checked = config.AllowHevcEncoding;
     page.querySelector('#chkAllowAv1Encoding').checked = config.AllowAv1Encoding;
-    page.querySelector('#chkAllowMjpegEncoding').checked = config.AllowMjpegEncoding;
     $('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
     $('#selectThreadCount', page).val(config.EncodingThreadCount);
     page.querySelector('#chkEnableAudioVbr').checked = config.EnableAudioVbr;
@@ -128,7 +127,6 @@ function onSubmit() {
             config.EnableHardwareEncoding = form.querySelector('#chkHardwareEncoding').checked;
             config.AllowHevcEncoding = form.querySelector('#chkAllowHevcEncoding').checked;
             config.AllowAv1Encoding = form.querySelector('#chkAllowAv1Encoding').checked;
-            config.AllowMjpegEncoding = form.querySelector('#chkAllowMjpegEncoding').checked;
             ApiClient.updateNamedConfiguration('encoding', config).then(function () {
                 updateEncoder(form);
             }, function () {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 11b833f6c8..9ebf5badf5 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1648,10 +1648,10 @@
     "ForeignPartsOnly": "Forced/Foreign parts only",
     "HearingImpairedShort": "HI/SDH",
     "LabelIsHearingImpaired": "For hearing impaired (SDH)",
-    "AllowMjpegEncoding": "Allow encoding in MJPEG format (used during trickplay generation)",
     "Trickplay": "Trickplay",
-    "LabelTrickplayAccel": "Enable hardware acceleration",
-    "LabelTrickplayAccelHelp": "Make sure to enable 'Allow MJPEG Encoding' in Transcoding if your hardware supports it.",
+    "LabelTrickplayAccel": "Enable hardware decoding",
+    "LabelTrickplayAccelEncoding": "Enable hardware accelerated MJPEG encoding",
+    "LabelTrickplayAccelEncodingHelp": "Currently only available on QSV and VAAPI, this option has no effect on other hardware acceleration methods.",
     "NonBlockingScan": "Non Blocking - queues generation, then returns",
     "BlockingScan": "Blocking - queues generation, blocks scan until complete",
     "LabelScanBehavior": "Scan Behavior",