diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v859/serializer/DebugDrawerSerializer_v859.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v859/serializer/DebugDrawerSerializer_v859.java
index 52e4fc984..ce2261482 100644
--- a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v859/serializer/DebugDrawerSerializer_v859.java
+++ b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v859/serializer/DebugDrawerSerializer_v859.java
@@ -34,9 +34,14 @@ protected void writeShape(ByteBuf buffer, BedrockCodecHelper helper, DebugShape
         VarInts.writeUnsignedLong(buffer, shape.getId());
         writeCommonShapeData(buffer, helper, shape);
         VarInts.writeInt(buffer, shape.getDimension());
-        VarInts.writeUnsignedInt(buffer, toPayloadType(shape.getType()));
 
-        switch (shape.getType()) {
+        DebugShape.Type type = shape.getType();
+        VarInts.writeUnsignedInt(buffer, toPayloadType(type));
+        if (type == null) {
+            return;
+        }
+
+        switch (type) {
             case ARROW:
                 DebugArrow arrow = (DebugArrow) shape;
                 helper.writeOptionalNull(buffer, arrow.getArrowEndPosition(), WRITE_VECTOR3F);