diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
index dddfbef0..fe10746d 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
@@ -185,7 +185,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
       startPos = packet.getCommand().length() + 1;
       length = longestLength;
     } else {
-      length = packet.getCommand().substring(startPos).indexOf(' ') + 1;
+      length = packet.getCommand().length() - startPos;
     }
 
     resp.setStart(startPos);