diff --git a/nms-patches/DefinedStructureManager.patch b/nms-patches/DefinedStructureManager.patch
new file mode 100644
index 0000000000..d1bdcca564
--- /dev/null
+++ b/nms-patches/DefinedStructureManager.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/DefinedStructureManager.java
++++ b/net/minecraft/server/DefinedStructureManager.java
+@@ -20,7 +20,7 @@
+ public class DefinedStructureManager implements IResourcePackListener {
+ 
+     private static final Logger LOGGER = LogManager.getLogger();
+-    private final Map<MinecraftKey, DefinedStructure> b = Maps.newHashMap();
++    private final Map<MinecraftKey, DefinedStructure> b = Maps.newConcurrentMap(); // SPIGOT-5287
+     private final DataFixer c;
+     private final MinecraftServer d;
+     private final java.nio.file.Path e;