diff --git a/moonlight-common/src/com/limelight/nvstream/control/ControlStream.java b/moonlight-common/src/com/limelight/nvstream/control/ControlStream.java
index 6fe33c4d..db8d56ee 100644
--- a/moonlight-common/src/com/limelight/nvstream/control/ControlStream.java
+++ b/moonlight-common/src/com/limelight/nvstream/control/ControlStream.java
@@ -562,6 +562,7 @@ public class ControlStream implements ConnectionStatusListener, InputPacketSende
 			// Use the class's serialization buffer to construct the wireform to send
 			synchronized (serializationBuffer) {
 				serializationBuffer.rewind();
+				serializationBuffer.limit(serializationBuffer.capacity());
 				serializationBuffer.putShort(type);
 				serializationBuffer.putShort(paylen);
 				serializationBuffer.put(payload);