diff --git a/CraftBukkit-Patches/0157-Clear-Packet-Queue-on-Disconnect.patch b/CraftBukkit-Patches/0157-Clear-Packet-Queue-on-Disconnect.patch
index 504a81803..aa4de1db6 100644
--- a/CraftBukkit-Patches/0157-Clear-Packet-Queue-on-Disconnect.patch
+++ b/CraftBukkit-Patches/0157-Clear-Packet-Queue-on-Disconnect.patch
@@ -16,4 +16,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              } else {
                  NetworkManager.g.warn("handleDisconnection() called twice");
              }
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+         }
+ 
+         // CraftBukkit start
+-        if (packet == null) {
++        if (packet == null || this.processedDisconnect) { // Spigot
+             return;
+         } else if (packet instanceof PacketPlayOutSpawnPosition) {
+             PacketPlayOutSpawnPosition packet6 = (PacketPlayOutSpawnPosition) packet;
 --
\ No newline at end of file