diff --git a/Spigot-Server-Patches/Improved-Watchdog-Support.patch b/Spigot-Server-Patches/Improved-Watchdog-Support.patch
index 5bb6d469ea..4ec0450e82 100644
--- a/Spigot-Server-Patches/Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/Improved-Watchdog-Support.patch
@@ -157,6 +157,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    Thread.sleep(1);
 +                } catch (InterruptedException e) {}
 +            }
++            // We've just obliterated the main thread, this will prevent stop from dying when removing players
++            MinecraftServer.getServer().getWorlds().forEach(world -> {
++                world.tickingEntities = false;
++            });
 +        }
 +        // Paper end
          // CraftBukkit end
@@ -575,10 +579,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                        e.printStackTrace();
 +                    }
 +                    if (!server.hasStopped()) {
-+                        // We've just obliterated the main thread, this will prevent stop from dying when removing players
-+                        MinecraftServer.getServer().getWorlds().forEach(world -> {
-+                            world.tickingEntities = false;
-+                        });
 +                        server.close();
 +                    }
                  }