diff --git a/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch
index 6063e3d59f..aa825694c0 100644
--- a/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index e7e216850..9cd7c9064 100644
+index e7e21685..404e7834 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -0,0 +0,0 @@ public class ServerConnection {
@@ -14,11 +14,11 @@ index e7e216850..9cd7c9064 100644
      private final List<ChannelFuture> listeningChannels = Collections.synchronizedList(Lists.newArrayList());
      private final List<NetworkManager> connectedChannels = Collections.synchronizedList(Lists.newArrayList());
 +    // Paper start - prevent blocking on adding a new network manager while the server is ticking
-+    private final List<NetworkManager> pending = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
++    private final java.util.Queue<NetworkManager> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
 +    private void addPending() {
-+        synchronized (pending) {
-+            connectedChannels.addAll(pending);
-+            pending.clear();
++        NetworkManager manager = null;
++        while ((manager = pending.poll()) != null) {
++            connectedChannels.add(manager);
 +        }
 +    }
 +    // Paper end