diff --git a/ui/index.html b/ui/index.html
index ae0eb026..e2efbb06 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -323,7 +323,7 @@
 <script src="media/js/inpainting-editor.js?v=1"></script>
 <script src="media/js/image-modifiers.js?v=6"></script>
 <script src="media/js/auto-save.js?v=7"></script>
-<script src="media/js/main.js?v=11"></script>
+<script src="media/js/main.js?v=12"></script>
 <script src="media/js/themes.js?v=4"></script>
 <script src="media/js/dnd.js?v=8"></script>
 <script>
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index abed8b7c..65d6d973 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -814,7 +814,11 @@ function getCurrentRenderDeviceSelection() {
         return 'cpu'
     }
 
-    return $(useGPUsField).val().join(',')
+    let selectedGPUs = $(useGPUsField).val()
+    if (selectedGPUs.length == 0) {
+        selectedGPUs = ['auto']
+    }
+    return selectedGPUs.join(',')
 }
 
 function makeImage() {
@@ -1134,7 +1138,7 @@ useCPUField.addEventListener('click', function() {
     let gpuSettingEntry = getParameterSettingsEntry('use_gpus')
     if (this.checked) {
         gpuSettingEntry.style.display = 'none'
-    } else if ($(useGPUsField).val().length >= MIN_GPUS_TO_SHOW_SELECTION) {
+    } else if (useGPUsField.options.length >= MIN_GPUS_TO_SHOW_SELECTION) {
         gpuSettingEntry.style.display = ''
     }
 })