diff --git a/patches/api/Increase-custom-payload-channel-message-size.patch b/patches/api/Set-true-custom-payload-channel-size-limit.patch
similarity index 73%
rename from patches/api/Increase-custom-payload-channel-message-size.patch
rename to patches/api/Set-true-custom-payload-channel-size-limit.patch
index 64e4c5e5bd..c7223a004c 100644
--- a/patches/api/Increase-custom-payload-channel-message-size.patch
+++ b/patches/api/Set-true-custom-payload-channel-size-limit.patch
@@ -1,10 +1,9 @@
 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
+Subject: [PATCH] Set true custom payload channel size limit
 
-Doubles the custom payload size limit imposed by bukkit, also creates a system
-property to allow customizing the size `paper.maxCustomChannelName`
+This fixes compatibility with some mods that are sending very long channel names. Also gives developers the ability to send longer channel names.
 
 diff --git a/src/main/java/org/bukkit/plugin/messaging/Messenger.java b/src/main/java/org/bukkit/plugin/messaging/Messenger.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -15,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * Represents the largest size that a Plugin Channel may be.
       */
 -    public static final int MAX_CHANNEL_SIZE = 64;
-+    public static final int MAX_CHANNEL_SIZE = Integer.getInteger("paper.maxCustomChannelName", 64); // Paper
++    public static final int MAX_CHANNEL_SIZE = Integer.getInteger("paper.maxCustomChannelName", java.lang.Short.MAX_VALUE); // Paper - set true max channel size
  
      /**
       * Checks if the specified channel is a reserved name.