diff --git a/Spigot-Server-Patches/0454-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0454-Remote-Connections-shouldn-t-hold-up-shutdown.patch
new file mode 100644
index 000000000..9e1275c53
--- /dev/null
+++ b/Spigot-Server-Patches/0454-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -0,0 +1,28 @@
+From 13366d82bb29fe26824ede0520ac7e4190aef8c2 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Tue, 31 Mar 2020 03:50:42 -0400
+Subject: [PATCH] Remote Connections shouldn't hold up shutdown
+
+Bugs in the connection logic appears to leave stale connections even, preventing shutdown
+
+diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
+index 349a0ea213..1ef7890da5 100644
+--- a/src/main/java/net/minecraft/server/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/DedicatedServer.java
+@@ -415,11 +415,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+         }
+ 
+         if (this.remoteControlListener != null) {
+-            this.remoteControlListener.b();
++            //this.remoteControlListener.b(); // Paper - don't wait for remote connections
+         }
+ 
+         if (this.remoteStatusListener != null) {
+-            this.remoteStatusListener.b();
++            //this.remoteStatusListener.b(); // Paper - don't wait for remote connections
+         }
+ 
+         System.exit(0); // CraftBukkit
+-- 
+2.25.1
+