diff --git a/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 1a8232151..f2ecfcd1b 100644
--- a/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -59,6 +59,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.restart = restart;
      }
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
+         while ( !stopping )
+         {
+             //
+-            if ( lastTick != 0 && System.currentTimeMillis() > lastTick + timeoutTime )
++            if ( !Boolean.getBoolean("disable.watchdog") && lastTick != 0 && System.currentTimeMillis() > lastTick + timeoutTime ) // Paper - Add property to disable
              {
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );