diff --git a/Spigot-Server-Patches/0400-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0400-Use-more-reasonable-thread-count-default-for-bootstr.patch
new file mode 100644
index 0000000000..4fd2497203
--- /dev/null
+++ b/Spigot-Server-Patches/0400-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -0,0 +1,22 @@
+From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Tue, 23 Oct 2018 23:14:38 -0400
+Subject: [PATCH] Use more reasonable thread count default for bootstrap
+
+
+diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
+index 7ac07ac07ac0..7ac07ac07ac0 100644
+--- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
++++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
+@@ -22,7 +22,7 @@ public class DataConverterRegistry {
+ 
+         a(datafixerbuilder);
+         // CraftBukkit start
+-        ForkJoinPool pool = new ForkJoinPool(Integer.getInteger("net.minecraft.server.DataConverterRegistry.bootstrapThreads", Math.min(Runtime.getRuntime().availableProcessors(), 2)));
++        ForkJoinPool pool = new ForkJoinPool(Integer.getInteger("net.minecraft.server.DataConverterRegistry.bootstrapThreads", Math.min(6, Math.max(Runtime.getRuntime().availableProcessors() - 2, 1)))); // Paper - use more reasonable default
+         DataFixer fixer = datafixerbuilder.build(pool);
+         pool.shutdown();
+         return fixer;
+-- 
+2.19.1
+