diff --git a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java
index 645273aa47..a11f1184af 100644
--- a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java
+++ b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java
@@ -188,11 +188,7 @@ public class LinkManager {
                         int portPart = TcpConnector.getTcpPort(port);
                         String hostname = TcpConnector.getHostname(port);
                         socket = new Socket(hostname, portPart);
-                        TcpIoStream tcpIoStream = new TcpIoStream(logger, socket);
-                        IncomingDataBuffer dataBuffer = IncomingDataBuffer.createDataBuffer(tcpIoStream, logger);
-                        tcpIoStream.setDataBuffer(dataBuffer);
-
-                        return tcpIoStream;
+                        return new TcpIoStream(logger, socket);
                     } catch (Throwable e) {
                         stateListener.onConnectionFailed();
                         return null;
diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java
index 0046c4eb63..6a98bf83e4 100644
--- a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java
+++ b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java
@@ -35,6 +35,8 @@ public class TcpIoStream implements IoStream {
             throw new NullPointerException("output");
         this.output = output;
         this.input = input;
+        IncomingDataBuffer dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger);
+        setDataBuffer(dataBuffer);
     }
 
     @Override