diff --git a/nms-patches/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.patch b/nms-patches/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.patch
new file mode 100644
index 000000000..7e2451598
--- /dev/null
+++ b/nms-patches/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.patch
@@ -0,0 +1,12 @@
+--- a/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java
++++ b/net/minecraft/network/protocol/common/ServerboundCustomPayloadPacket.java
+@@ -16,8 +16,7 @@
+     private static final int MAX_PAYLOAD_SIZE = 32767;
+     public static final StreamCodec<PacketDataSerializer, ServerboundCustomPayloadPacket> STREAM_CODEC = CustomPacketPayload.codec((minecraftkey) -> {
+         return DiscardedPayload.codec(minecraftkey, 32767);
+-    }, (List) SystemUtils.make(Lists.newArrayList(new CustomPacketPayload.c[]{new CustomPacketPayload.c<>(BrandPayload.TYPE, BrandPayload.STREAM_CODEC)}), (arraylist) -> {
+-    })).map(ServerboundCustomPayloadPacket::new, ServerboundCustomPayloadPacket::payload);
++    }, java.util.Collections.emptyList()).map(ServerboundCustomPayloadPacket::new, ServerboundCustomPayloadPacket::payload); // CraftBukkit - treat all packets the same
+ 
+     @Override
+     public PacketType<ServerboundCustomPayloadPacket> type() {