diff --git a/package.json b/package.json
index afa71b83..9fb3e9d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.4.2-q",
+  "version": "0.4.2-r",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/views/default-min.handlebars b/views/default-min.handlebars
index 23c40012..92ded4a7 100644
--- a/views/default-min.handlebars
+++ b/views/default-min.handlebars
@@ -8701,6 +8701,7 @@ var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this
                 // Display "connect all" and "auto"
                 QV('kvmMultiConnectButtonSpan', (kvmDivs.length < 16));
                 QV('kvmAutoConnectButtonSpan', (kvmDivs.length < 16));
+                if (kvmDivs.length >= 16) { Q('autoConnectDesktopCheckbox').checked = false; }
 
                 // If displaying devices by groups, sort the group names and display the devices.
                 if (sort == 3) {
diff --git a/views/default.handlebars b/views/default.handlebars
index d8734b17..a24219b0 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -2672,6 +2672,7 @@
                 // Display "connect all" and "auto"
                 QV('kvmMultiConnectButtonSpan', (kvmDivs.length < 16));
                 QV('kvmAutoConnectButtonSpan', (kvmDivs.length < 16));
+                if (kvmDivs.length >= 16) { Q('autoConnectDesktopCheckbox').checked = false; }
 
                 // If displaying devices by groups, sort the group names and display the devices.
                 if (sort == 3) {