diff --git a/nodes/core/io/31-tcpin.js b/nodes/core/io/31-tcpin.js
index f8e65d916..b1fb582b0 100644
--- a/nodes/core/io/31-tcpin.js
+++ b/nodes/core/io/31-tcpin.js
@@ -393,7 +393,7 @@ module.exports = function(RED) {
             }
             if (!node.connected) {
                 client = net.Socket();
-                client.setTimeout(socketTimeout);
+                if (socketTimeout) { client.setTimeout(socketTimeout); }
                 //node.status({});
                 var host = node.server || msg.host;
                 var port = node.port || msg.port;