diff --git a/legacyver/proto/command.go b/legacyver/proto/command.go
index 995adc4..9eb9439 100644
--- a/legacyver/proto/command.go
+++ b/legacyver/proto/command.go
@@ -258,5 +258,9 @@ func CommandOriginData(r protocol.IO, x *protocol.CommandOrigin) {
 	}
 	r.UUID(&x.UUID)
 	r.String(&x.RequestID)
-	r.Int64(&x.PlayerUniqueID)
+	if IsProtoGTE(r, ID898) {
+		r.Int64(&x.PlayerUniqueID)
+	} else if x.Origin == protocol.CommandOriginDevConsole || x.Origin == protocol.CommandOriginTest {
+		r.Varint64(&x.PlayerUniqueID)
+	}
 }