diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
index 3035a7f5e..0cc700eec 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
@@ -181,6 +181,22 @@ public class Protocol1_16To1_15_2 extends Protocol<ClientboundPackets1_15, Clien
             }
         });
 
+        // Spigot has the arbitrary limit of 32 in 1.15, upped to 64 in 1.16
+        if (isSpigot()) {
+            registerIncoming(ServerboundPackets1_16.PLUGIN_MESSAGE, new PacketRemapper() {
+                @Override
+                public void registerMap() {
+                    handler(wrapper -> {
+                        String channel = wrapper.passthrough(Type.STRING);
+                        if (channel.length() > 32) {
+                            Via.getPlatform().getLogger().warning("Ignoring incoming plugin channel, as it is longer than 32 characters: " + channel);
+                            wrapper.cancel();
+                        }
+                    });
+                }
+            });
+        }
+
         registerIncoming(ServerboundPackets1_16.PLAYER_ABILITIES, new PacketRemapper() {
             @Override
             public void registerMap() {
@@ -270,4 +286,13 @@ public class Protocol1_16To1_15_2 extends Protocol<ClientboundPackets1_15, Clien
             userConnection.put(new ClientWorld(userConnection));
         }
     }
+
+    private boolean isSpigot() {
+        try {
+            Class.forName("org.spigotmc.SpigotConfig");
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
 }