diff --git a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
index 009076cf9..269e11dc3 100644
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -492,12 +492,12 @@
                 let ok = true;
                 if ($("#node-config-input-clientid").length) {
                     // Currently editing the node
-                    let needClientId = !$("#node-config-input-cleansession").is(":checked") || !$("#node-config-input-autoUnsubscribe").is(":checked")
+                    let needClientId = !$("#node-config-input-cleansession").is(":checked")
                     if (needClientId) {
                         ok = (v||"").length > 0;
                     }
                 } else {
-                    let needClientId = !(this.cleansession===undefined || this.cleansession) || this.autoUnsubscribe;
+                    let needClientId = !(this.cleansession===undefined || this.cleansession)
                     if (needClientId) {
                         ok = (v||"").length > 0;
                     }