diff --git a/src/comms/java/cabaletta/comms/BufferedConnection.java b/src/comms/java/cabaletta/comms/BufferedConnection.java
index 6fb079984..f21a684ce 100644
--- a/src/comms/java/cabaletta/comms/BufferedConnection.java
+++ b/src/comms/java/cabaletta/comms/BufferedConnection.java
@@ -84,6 +84,10 @@ public class BufferedConnection implements IConnection {
         return msgs;
     }
 
+    public void handleAllPendingMessages(IMessageListener listener) throws IOException {
+        receiveMessagesNonBlocking().forEach(msg -> msg.handle(listener));
+    }
+
     public static BufferedConnection makeBuffered(IConnection conn) {
         if (conn instanceof BufferedConnection) {
             return (BufferedConnection) conn;
diff --git a/src/main/java/baritone/behavior/ControllerBehavior.java b/src/main/java/baritone/behavior/ControllerBehavior.java
index aceda3497..340310681 100644
--- a/src/main/java/baritone/behavior/ControllerBehavior.java
+++ b/src/main/java/baritone/behavior/ControllerBehavior.java
@@ -38,7 +38,6 @@ import cabaletta.comms.upward.MessageStatus;
 import net.minecraft.util.math.BlockPos;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Objects;
 
 public class ControllerBehavior extends Behavior implements IMessageListener {
@@ -91,8 +90,7 @@ public class ControllerBehavior extends Behavior implements IMessageListener {
             return;
         }
         try {
-            List<iMessage> msgs = conn.receiveMessagesNonBlocking();
-            msgs.forEach(msg -> msg.handle(this));
+            conn.handleAllPendingMessages(this);
         } catch (IOException e) {
             e.printStackTrace();
             disconnect();