diff --git a/nms-patches/RemoteControlListener.patch b/nms-patches/RemoteControlListener.patch
new file mode 100644
index 0000000000..03a7df4020
--- /dev/null
+++ b/nms-patches/RemoteControlListener.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/RemoteControlListener.java
++++ b/net/minecraft/server/RemoteControlListener.java
+@@ -109,7 +109,7 @@
+         RemoteControlListener.LOGGER.debug("closeSocket: {}", serversocket);
+ 
+         try {
+-            serversocket.close();
++            if (serversocket != null) serversocket.close(); // CraftBukkit - SPIGOT-5867, MC-193339: NPE during shutdown if no password
+         } catch (IOException ioexception) {
+             RemoteControlListener.LOGGER.warn("Failed to close socket", ioexception);
+         }