diff --git a/Spigot-Server-Patches/Make-duplicate-entity-UUID-logging-toggleable.patch b/Spigot-Server-Patches/Make-duplicate-entity-UUID-logging-toggleable.patch
new file mode 100644
index 0000000000..1a83520e78
--- /dev/null
+++ b/Spigot-Server-Patches/Make-duplicate-entity-UUID-logging-toggleable.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Mon, 28 Dec 2015 20:06:25 -0600
+Subject: [PATCH] Make duplicate entity UUID logging toggleable
+
+
+diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/WorldServer.java
++++ b/src/main/java/net/minecraft/server/WorldServer.java
+@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+         // CraftBukkit start
+         UUID uuid = entity.getUniqueID();
+ 
+-        if (this.entitiesByUUID.containsKey(uuid)) {
++        if (this.paperSpigotConfig.logDuplicateEntityUUIDs && this.entitiesByUUID.containsKey(uuid)) { // PaperSpigot - Make toggleable
+             Entity entity1 = (Entity) this.entitiesByUUID.get(uuid);
+ 
+             if (this.g.contains(entity1)) {
+diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
++++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
+     {
+         useHopperCheck = getBoolean( "use-hopper-check", false );
+     }
++
++    public boolean logDuplicateEntityUUIDs;
++    private void logDuplicateEntityUUIDs()
++    {
++        logDuplicateEntityUUIDs = getBoolean( "log-duplicate-entity-UUIDs", true );
++    }
+ }
+--
\ No newline at end of file