diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
index 71bedd9320..a1e8a10a82 100644
--- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
+++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
@@ -141,12 +141,18 @@ public class IncomingDataBuffer {
         }
     }
 
-    public byte readByte() throws EOFException {
+    public byte readByte() throws EOFException, InterruptedException {
+        boolean timeout = waitForBytes("readByte", System.currentTimeMillis(), 1);
+        if (timeout)
+            throw new IllegalStateException("Timeout in readByte");
         return (byte) getByte();
     }
 
-    public int readInt() throws EOFException {
-        return getInt();
+    public int readInt() throws EOFException, InterruptedException {
+        boolean timeout = waitForBytes("readInt", System.currentTimeMillis(), 4);
+        if (timeout)
+            throw new IllegalStateException("Timeout in readByte");
+        return swap32(getInt());
     }
 
     public int read(byte[] packet) throws InterruptedException {