diff --git a/patches/server/Kick-on-main-for-illegal-chat.patch b/patches/server/Kick-on-main-for-illegal-chat.patch
index 201904a088..5a4db46068 100644
--- a/patches/server/Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/Kick-on-main-for-illegal-chat.patch
@@ -30,6 +30,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages());
  
+             if (optional.isPresent()) {
+                 this.server.submit(() -> {
++                    if (player.hasDisconnected()) return; // Paper
+                     this.performChatCommand(packet, (LastSeenMessages) optional.get());
+                     this.detectRateSpam("/" + packet.command()); // Spigot
+                 });
 @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {