diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index cab959304..71ace1044 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -163,6 +163,20 @@ const defaultSettings = {
     // AUTOMATIC1111 settings
     auto_url: 'http://localhost:7860',
     auto_auth: '',
+
+    hr_upscaler: 'Latent',
+    hr_scale: 2.0,
+    hr_scale_min: 1.0,
+    hr_scale_max: 4.0,
+    hr_scale_step: 0.1,
+    denoising_strength: 0.7,
+    denoising_strength_min: 0.0,
+    denoising_strength_max: 1.0,
+    denoising_strength_step: 0.01,
+    hr_second_pass_steps: 0,
+    hr_second_pass_steps_min: 0,
+    hr_second_pass_steps_max: 150,
+    hr_second_pass_steps_step: 1,
 }
 
 const getAutoRequestBody = () => ({ url: extension_settings.sd.auto_url, auth: extension_settings.sd.auto_auth });
@@ -209,6 +223,9 @@ async function loadSettings() {
     $('#sd_negative_prompt').val(extension_settings.sd.negative_prompt).trigger('input');
     $('#sd_width').val(extension_settings.sd.width).trigger('input');
     $('#sd_height').val(extension_settings.sd.height).trigger('input');
+    $('#sd_hr_scale').val(extension_settings.sd.hr_scale).trigger('input');
+    $('#sd_denoising_strength').val(extension_settings.sd.denoising_strength).trigger('input');
+    $('#sd_hr_second_pass_steps').val(extension_settings.sd.hr_second_pass_steps).trigger('input');
     $('#sd_horde').prop('checked', extension_settings.sd.horde);
     $('#sd_horde_nsfw').prop('checked', extension_settings.sd.horde_nsfw);
     $('#sd_horde_karras').prop('checked', extension_settings.sd.horde_karras);
@@ -402,6 +419,29 @@ function onAutoAuthInput() {
     saveSettingsDebounced();
 }
 
+function onHrUpscalerChange() {
+    extension_settings.sd.hr_upscaler = $('#sd_hr_upscaler').find(':selected').val();
+    saveSettingsDebounced();
+}
+
+function onHrScaleInput() {
+    extension_settings.sd.hr_scale = Number($('#sd_hr_scale').val());
+    $('#sd_hr_scale_value').text(extension_settings.sd.hr_scale.toFixed(1));
+    saveSettingsDebounced();
+}
+
+function onDenoisingStrengthInput() {
+    extension_settings.sd.denoising_strength = Number($('#sd_denoising_strength').val());
+    $('#sd_denoising_strength_value').text(extension_settings.sd.denoising_strength.toFixed(2));
+    saveSettingsDebounced();
+}
+
+function onHrSecondPassStepsInput() {
+    extension_settings.sd.hr_second_pass_steps = Number($('#sd_hr_second_pass_steps').val());
+    $('#sd_hr_second_pass_steps_value').text(extension_settings.sd.hr_second_pass_steps);
+    saveSettingsDebounced();
+}
+
 async function validateAutoUrl() {
     try {
         if (!extension_settings.sd.auto_url) {
@@ -466,6 +506,26 @@ async function getAutoRemoteModel() {
     }
 }
 
+async function getAutoRemoteUpscalers() {
+    try {
+        const result = await fetch('/api/sd/upscalers', {
+            method: 'POST',
+            headers: getRequestHeaders(),
+            body: JSON.stringify(getAutoRequestBody()),
+        });
+
+        if (!result.ok) {
+            throw new Error('SD WebUI returned an error.');
+        }
+
+        const data = await result.json();
+        return data;
+    } catch (error) {
+        console.error(error);
+        return [extension_settings.sd.hr_upscaler];
+    }
+}
+
 async function updateAutoRemoteModel() {
     try {
         const result = await fetch('/api/sd/set-model', {
@@ -690,6 +750,20 @@ async function loadAutoModels() {
             throw new Error('SD WebUI returned an error.');
         }
 
+        const upscalers = await getAutoRemoteUpscalers();
+
+        if (Array.isArray(upscalers) && upscalers.length > 0) {
+            $('#sd_hr_upscaler').empty();
+
+            for (const upscaler of upscalers) {
+                const option = document.createElement('option');
+                option.innerText = upscaler;
+                option.value = upscaler;
+                option.selected = upscaler === extension_settings.sd.hr_upscaler;
+                $('#sd_hr_upscaler').append(option);
+            }
+        }
+
         const data = await result.json();
         return data;
     } catch (error) {
@@ -957,6 +1031,10 @@ async function generateExtrasImage(prompt) {
             restore_faces: !!extension_settings.sd.restore_faces,
             enable_hr: !!extension_settings.sd.enable_hr,
             karras: !!extension_settings.sd.horde_karras,
+            hr_upscaler: extension_settings.sd.hr_upscaler,
+            hr_scale: extension_settings.sd.hr_scale,
+            denoising_strength: extension_settings.sd.denoising_strength,
+            hr_second_pass_steps: extension_settings.sd.hr_second_pass_steps,
         }),
     });
 
@@ -1020,8 +1098,12 @@ async function generateAutoImage(prompt) {
             cfg_scale: extension_settings.sd.scale,
             width: extension_settings.sd.width,
             height: extension_settings.sd.height,
-            enable_hr: !!extension_settings.sd.enable_hr,
             restore_faces: !!extension_settings.sd.restore_faces,
+            enable_hr: !!extension_settings.sd.enable_hr,
+            hr_upscaler: extension_settings.sd.hr_upscaler,
+            hr_scale: extension_settings.sd.hr_scale,
+            denoising_strength: extension_settings.sd.denoising_strength,
+            hr_second_pass_steps: extension_settings.sd.hr_second_pass_steps,
             // Ensure generated img is saved to disk
             save_images: true,
             send_images: true,
@@ -1275,6 +1357,10 @@ jQuery(async () => {
     $('#sd_auto_validate').on('click', validateAutoUrl);
     $('#sd_auto_url').on('input', onAutoUrlInput);
     $('#sd_auto_auth').on('input', onAutoAuthInput);
+    $('#sd_hr_upscaler').on('change', onHrUpscalerChange);
+    $('#sd_hr_scale').on('input', onHrScaleInput);
+    $('#sd_denoising_strength').on('input', onDenoisingStrengthInput);
+    $('#sd_hr_second_pass_steps').on('input', onHrSecondPassStepsInput);
     $('#sd_character_prompt_block').hide();
 
     $('.sd_settings .inline-drawer-toggle').on('click', function () {
diff --git a/public/scripts/extensions/stable-diffusion/settings.html b/public/scripts/extensions/stable-diffusion/settings.html
index 873fea5d3..b51306b81 100644
--- a/public/scripts/extensions/stable-diffusion/settings.html
+++ b/public/scripts/extensions/stable-diffusion/settings.html
@@ -60,6 +60,10 @@
             <input id="sd_width" type="range" max="{{dimension_max}}" min="{{dimension_min}}" step="{{dimension_step}}" value="{{width}}" />
             <label for="sd_height">Height (<span id="sd_height_value"></span>)</label>
             <input id="sd_height" type="range" max="{{dimension_max}}" min="{{dimension_min}}" step="{{dimension_step}}" value="{{height}}" />
+            <label for="sd_model">Stable Diffusion model</label>
+            <select id="sd_model"></select>
+            <label for="sd_sampler">Sampling method</label>
+            <select id="sd_sampler"></select>
             <div class="flex-container marginTop10 margin-bot-10px">
                 <label class="flex1 checkbox_label">
                     <input id="sd_restore_faces" type="checkbox" />
@@ -70,10 +74,16 @@
                     Hires. Fix
                 </label>
             </div>
-            <label for="sd_model">Stable Diffusion model</label>
-            <select id="sd_model"></select>
-            <label for="sd_sampler">Sampling method</label>
-            <select id="sd_sampler"></select>
+            <div data-sd-source="auto">
+                <label for="sd_hr_upscaler">Upscaler</label>
+                <select id="sd_hr_upscaler"></select>
+                <label for="sd_hr_scale">Upscale by (<span id="sd_hr_scale_value"></span>)</label>
+                <input id="sd_hr_scale" type="range" min="{{hr_scale_min}}" max="{{hr_scale_max}}" step="{{hr_scale_step}}" value="{{hr_scale}}" />
+                <label for="sd_denoising_strength">Denoising strength (<span id="sd_denoising_strength_value"></span>)</label>
+                <input id="sd_denoising_strength" type="range" min="{{denoising_strength_min}}" max="{{denoising_strength_max}}" step="{{denoising_strength_step}}" value="{{denoising_strength}}" />
+                <label for="sd_hr_second_pass_steps">Hires steps (2nd pass) (<span id="sd_hr_second_pass_steps_value"></span>)</label>
+                <input id="sd_hr_second_pass_steps" type="range" min="{{hr_second_pass_steps_min}}" max="{{hr_second_pass_steps_max}}" step="{{hr_second_pass_steps_max}}" value="{{hr_second_pass_steps}}" />
+            </div>
             <label for="sd_prompt_prefix">Common prompt prefix</label>
             <textarea id="sd_prompt_prefix" class="text_pole textarea_compact" rows="3"></textarea>
             <div id="sd_character_prompt_block">
diff --git a/server.js b/server.js
index bff3c1b95..5227ed642 100644
--- a/server.js
+++ b/server.js
@@ -4563,6 +4563,60 @@ app.post('/api/sd/ping', jsonParser, async (request, response) => {
     }
 });
 
+app.post('/api/sd/upscalers', jsonParser, async (request, response) => {
+    try {
+        async function getUpscalerModels() {
+            const url = new URL(request.body.url);
+            url.pathname = '/sdapi/v1/upscalers';
+
+            const result = await fetch(url, {
+                method: 'GET',
+                headers: {
+                    'Authorization': getBasicAuthHeader(request.body.auth),
+                },
+            });
+
+            if (!result.ok) {
+                throw new Error('SD WebUI returned an error.');
+            }
+
+            const data = await result.json();
+            const names = data.map(x => x.name);
+            return names;
+        }
+
+        async function getLatentUpscalers() {
+            const url = new URL(request.body.url);
+            url.pathname = '/sdapi/v1/latent-upscale-modes';
+
+            const result = await fetch(url, {
+                method: 'GET',
+                headers: {
+                    'Authorization': getBasicAuthHeader(request.body.auth),
+                },
+            });
+
+            if (!result.ok) {
+                throw new Error('SD WebUI returned an error.');
+            }
+
+            const data = await result.json();
+            const names = data.map(x => x.name);
+            return names;
+        }
+
+        const [upscalers, latentUpscalers] = await Promise.all([getUpscalerModels(), getLatentUpscalers()]);
+
+        // 0 = None, then Latent Upscalers, then Upscalers
+        upscalers.splice(1, 0, ...latentUpscalers);
+
+        return response.send(upscalers);
+    } catch (error) {
+        console.log(error);
+        return response.sendStatus(500);
+    }
+});
+
 app.post('/api/sd/samplers', jsonParser, async (request, response) => {
     try {
         const url = new URL(request.body.url);