diff --git a/Spigot-API-Patches/Increase-custom-payload-channel-message-size.patch b/Spigot-API-Patches/Increase-custom-payload-channel-message-size.patch
new file mode 100644
index 0000000000..5714e0e493
--- /dev/null
+++ b/Spigot-API-Patches/Increase-custom-payload-channel-message-size.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Fri, 18 Oct 2019 17:39:05 +0100
+Subject: [PATCH] Increase custom payload channel message size
+
+Doubles the custom payload size limit imposed by bukkit, also creates a system
+property to allow customizing the size `paper.maxCustomChannelName`
+
+diff --git a/src/main/java/org/bukkit/plugin/messaging/Messenger.java b/src/main/java/org/bukkit/plugin/messaging/Messenger.java
+index ea9b525f..682c7718 100644
+--- a/src/main/java/org/bukkit/plugin/messaging/Messenger.java
++++ b/src/main/java/org/bukkit/plugin/messaging/Messenger.java
+@@ -0,0 +0,0 @@ public interface Messenger {
+     /**
+      * Represents the largest size that a Plugin Channel may be.
+      */
+-    public static final int MAX_CHANNEL_SIZE = 32;
++    public static final int MAX_CHANNEL_SIZE = Integer.getInteger("paper.maxCustomChannelName", 64); // Paper
+ 
+     /**
+      * Checks if the specified channel is a reserved name.
+--
\ No newline at end of file