diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
index 500bbe2c2c..59f8c6301f 100644
--- a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
+++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
@@ -192,9 +192,13 @@ module.exports = function(RED) {
             this.on('close', function(done) {
                 node.doneClose = done;
                 this.closing = true;
-                if (client) { client.destroy(); }
                 clearTimeout(reconnectTimeout);
-                if (!node.connected) { done(); }
+                if (client) {
+                    client.destroy();
+                    // done() will be called by client 'close' event handler
+                } else {
+                    done();
+                }
             });
         }
         else {