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..52769f1ef6 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
@@ -189,8 +189,6 @@ public class LinkManager {
                         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;
                     } catch (Throwable e) {
diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java
index a2d63c3489..f6e2026f5d 100644
--- a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java
+++ b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java
@@ -90,8 +90,8 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
     @SuppressWarnings("InfiniteLoopStatement")
     private void runProxy(LinkManager linkManager, Socket clientSocket) throws IOException, InterruptedException {
         TcpIoStream stream = new TcpIoStream(logger, clientSocket);
-        IncomingDataBuffer in = IncomingDataBuffer.createDataBuffer(stream, logger);
-        stream.setDataBuffer(in);
+
+        IncomingDataBuffer in = stream.getDataBuffer();
 
         while (true) {
             byte first = in.readByte();
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 9f79e49bd8..2b909ca02b 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
@@ -33,6 +33,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