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 1a8232151e..4939b95e7c 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
@@ -58,6 +58,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.timeoutTime = timeoutTime;
          this.restart = restart;
      }
+ 
+     public static void doStart(int timeoutTime, boolean restart)
+     {
+-        if ( instance == null )
++        if ( !Boolean.getBoolean("disable.watchdog") && instance == null ) // Paper - Add property to disable
+         {
+             instance = new WatchdogThread( timeoutTime * 1000L, restart );
+             instance.start();
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
              {
                  Logger log = Bukkit.getServer().getLogger();