diff --git a/src/controllers/dashboard/general.html b/src/controllers/dashboard/general.html
index f099a81c5b..62f92d097c 100644
--- a/src/controllers/dashboard/general.html
+++ b/src/controllers/dashboard/general.html
@@ -80,6 +80,13 @@
                     </div>
                 </div>
 
+                <div class="verticalSection">
+                    <h2>${HeaderPerformance}</h2>
+                    <div class="inputContainer">
+                        <input is="emby-input" id="txtParallelImageEncodingLimit" label="${LabelParallelImageEncodingLimit}" type="number" pattern="[0-9]*" min="0" step="1" />
+                        <div class="fieldDescription">${LabelParallelImageEncodingLimitHelp}</div>
+                    </div>
+                </div>
                 <br />
                 <div>
                     <button is="emby-button" type="submit" class="raised button-submit block">
diff --git a/src/controllers/dashboard/general.js b/src/controllers/dashboard/general.js
index cc67c340d3..9b417534f4 100644
--- a/src/controllers/dashboard/general.js
+++ b/src/controllers/dashboard/general.js
@@ -21,6 +21,7 @@ import alert from '../../components/alert';
         $('#selectLocalizationLanguage', page).html(languageOptions.map(function (language) {
             return '<option value="' + language.Value + '">' + language.Name + '</option>';
         })).val(config.UICulture);
+        page.querySelector('#txtParallelImageEncodingLimit').value = config.ParallelImageEncodingLimit || '';
 
         loading.hide();
     }
@@ -36,6 +37,7 @@ import alert from '../../components/alert';
             config.MetadataPath = $('#txtMetadataPath', form).val();
             config.MetadataNetworkPath = $('#txtMetadataNetworkPath', form).val();
             config.QuickConnectAvailable = form.querySelector('#chkQuickConnectAvailable').checked;
+            config.ParallelImageEncodingLimit = parseInt(form.querySelector('#txtParallelImageEncodingLimit').value || '0', 10);
 
             ApiClient.updateServerConfiguration(config).then(function() {
                 ApiClient.getNamedConfiguration(brandingConfigKey).then(function(brandingConfig) {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 75d84bf7f5..5ed424f28e 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -420,6 +420,7 @@
     "HeaderPassword": "Password",
     "HeaderPasswordReset": "Password Reset",
     "HeaderPaths": "Paths",
+    "HeaderPerformance": "Performance",
     "HeaderPhotoAlbums": "Photo Albums",
     "HeaderPinCodeReset": "Reset Easy PIN Code",
     "HeaderPlayAll": "Play All",
@@ -791,6 +792,8 @@
     "LabelOriginalName": "Original name:",
     "LabelOriginalTitle": "Original title:",
     "LabelOverview": "Overview:",
+    "LabelParallelImageEncodingLimit": "Parallel image encoding limit",
+    "LabelParallelImageEncodingLimitHelp": "Maximum amount of image encodings that are allowed to run in parallel. Setting this to 0 will choose a limit based on your system specs.",
     "LabelParentalRating": "Parental rating:",
     "LabelParentNumber": "Parent number:",
     "LabelPassword": "Password:",