diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 510259b43e..4b30344134 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -39,6 +39,11 @@
 
                     <br />
                     <ul data-role="listview" class="ulForm">
+                        <li>
+                            <input type="checkbox" id="chkAllowUpscaling" name="chkAllowUpscaling" data-mini="true" />
+                            <label for="chkAllowUpscaling">Allow video upscaling when requested by clients</label>
+                            <div class="fieldDescription">In some cases this will result in improved video quality but will increase CPU usage.</div>
+                        </li>
                         <li>
                             <input type="checkbox" id="chkEnableDebugEncodingLogging" name="chkEnableDebugEncodingLogging" data-mini="true" />
                             <label for="chkEnableDebugEncodingLogging">Enable debug transcoding logging</label>
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index 08687ae580..b285f259c9 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -23,6 +23,8 @@
             $('#txtTranscodingTempPath', page).removeAttr("required");
         }
 
+        $('#chkAllowUpscaling', page).checked(config.AllowVideoUpscaling).checkboxradio("refresh");
+
         Dashboard.hideLoadingMsg();
     }
 
@@ -90,6 +92,7 @@
                     config.TranscodingTempPath = '';
                 }
 
+                config.AllowVideoUpscaling = $('#chkAllowUpscaling', form).checked();
                 config.EnableDebugEncodingLogging = $('#chkEnableDebugEncodingLogging', form).checked();
                 config.MediaEncodingQuality = $('.radioEncodingQuality:checked', form).val();