diff --git a/Spigot-Server-Patches/0220-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0220-Block-player-logins-during-server-shutdown.patch
index 51c5916cff..f7db161b5b 100644
--- a/Spigot-Server-Patches/0220-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0220-Block-player-logins-during-server-shutdown.patch
@@ -1,25 +1,26 @@
-From 52556556cd008f116a83ac71df9ad003d1ba3f91 Mon Sep 17 00:00:00 2001
+From 0b3e79d1a621e3ffb9785ab06e7e0192d11d13d9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 2158fcd3..2367023c 100644
+index 2158fcd32..c5434e6ba 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
-@@ -53,6 +53,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
+@@ -53,6 +53,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
      }
  
      public void e() {
 +        // Paper start - Do not allow logins while the server is shutting down
 +        if (!MinecraftServer.getServer().isRunning()) {
 +            this.disconnect(new ChatMessage(org.spigotmc.SpigotConfig.restartMessage));
++            return;
 +        }
 +        // Paper end
          if (this.g == LoginListener.EnumProtocolState.READY_TO_ACCEPT) {
              this.b();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.13.2.windows.1
+2.13.3.windows.1