diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
index 3569f33e7..bbdbcc495 100644
--- a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
@@ -93,10 +93,8 @@
                 var sockettype = $("#node-input-server").val();
                 if (sockettype == "client") {
                     $("#node-input-host-row").show();
-                    $("#node-input-tls-enable").show();
                 } else {
                     $("#node-input-host-row").hide();
-                    $("#node-input-tls-enable").hide();
                 }
                 var datamode = $("#node-input-datamode").val();
                 var datatype = $("#node-input-datatype").val();
@@ -222,7 +220,7 @@
                     $("#node-input-port-row").show();
                     $("#node-input-host-row").hide();
                     $("#node-input-end-row").show();
-                    $("#node-input-tls-enable").hide();
+                    $("#node-input-tls-enable").show();
                 }
             };
             updateOptions();
@@ -269,7 +267,7 @@
         </div>
     </div>
     <div class="form-row">
-        <label for="node-input-out"><i class="fa fa-sign-out"></i> <span data-i18n="tcpin.label.return"></span></label>
+        <label for="node-input-ret"><i class="fa fa-sign-out"></i> <span data-i18n="tcpin.label.return"></span></label>
         <select type="text" id="node-input-ret" style="width:54%;">
             <option value="buffer" data-i18n="tcpin.output.buffer"></option>
             <option value="string" data-i18n="tcpin.output.string"></option>
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 9b1ee44ed..e77600ed8 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
@@ -93,7 +93,6 @@ module.exports = function(RED) {
         this.connected = false;
         var node = this;
         var count = 0;
-        var nlstr = (this.newline && !this.newline.trim()) ? false : true;
         if (n.tls) { var tlsNode = RED.nodes.getNode(n.tls); }
 
         if (!node.server) {
@@ -105,8 +104,7 @@ module.exports = function(RED) {
                 node.log(RED._("tcpin.status.connecting",{host:node.host,port:node.port}));
                 node.status({fill:"grey",shape:"dot",text:"common.status.connecting"});
                 var id = RED.util.generateId();
-                var connOpts = {host: node.host
-                };
+                var connOpts = {host: node.host};
                 if (n.tls) {
                     var connOpts = tlsNode.addTLSOptions({host: node.host});
                     client = tls.connect(node.port, connOpts, function() {
@@ -137,8 +135,7 @@ module.exports = function(RED) {
                             buffer = buffer+data;
                             var parts = buffer.split(node.newline);
                             for (var i = 0; i<parts.length-1; i+=1) {
-                                if (nlstr) { parts[i] += node.newline; }
-                                msg = {topic:node.topic, payload:parts[i]};
+                                msg = {topic:node.topic, payload:parts[i] + node.newline.trimEnd()};
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -199,7 +196,13 @@ module.exports = function(RED) {
             });
         }
         else {
-            var server = net.createServer(function (socket) {
+            let srv = net;
+            let connOpts;
+            if (n.tls) {
+                srv = tls;
+                connOpts = tlsNode.addTLSOptions({});
+            }
+            var server = srv.createServer(connOpts, function (socket) {
                 socket.setKeepAlive(true,120000);
                 if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
                 var id = RED.util.generateId();
@@ -431,7 +434,13 @@ module.exports = function(RED) {
         else {
             var connectedSockets = [];
             node.status({text:RED._("tcpin.status.connections",{count:0})});
-            var server = net.createServer(function (socket) {
+            let srv = net;
+            let connOpts;
+            if (n.tls) {
+                srv = tls;
+                connOpts = tlsNode.addTLSOptions({});
+            }
+            var server = srv.createServer(connOpts, function (socket) {
                 socket.setKeepAlive(true,120000);
                 if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
                 node.log(RED._("tcpin.status.connection-from",{host:socket.remoteAddress, port:socket.remotePort}));