diff --git a/nodes/core/io/10-mqtt.js b/nodes/core/io/10-mqtt.js
index fe663737b..99b1a4244 100644
--- a/nodes/core/io/10-mqtt.js
+++ b/nodes/core/io/10-mqtt.js
@@ -143,8 +143,11 @@ module.exports = function(RED) {
                 return done();
             }
             if (Object.keys(node.users).length === 0) {
-                if (node.client) {
+                if (node.client && node.client.connected) {
                     return node.client.end(done);
+                } else {
+                    node.client.end();
+                    done();
                 }
             }
             done();