diff --git a/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java b/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java
index 27a12e99..1c696258 100644
--- a/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java
+++ b/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java
@@ -85,7 +85,6 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
         }
 
         FastAccessTransformerList.attemptReplace();
-        ModWorkManagerQueue.replace();
         DFUBlaster.blastMaps();
 
         /* https://github.com/FabricMC/Mixin/pull/99 */
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/core/BootstrapMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/core/BootstrapMixin.java
new file mode 100644
index 00000000..4ec57d04
--- /dev/null
+++ b/src/main/java/org/embeddedt/modernfix/mixin/core/BootstrapMixin.java
@@ -0,0 +1,26 @@
+package org.embeddedt.modernfix.mixin.core;
+
+import net.minecraft.server.Bootstrap;
+import org.apache.logging.log4j.Logger;
+import org.embeddedt.modernfix.load.ModWorkManagerQueue;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Bootstrap.class)
+public class BootstrapMixin {
+    @Shadow private static boolean isBootstrapped;
+
+    @Shadow @Final private static Logger LOGGER;
+
+    @Inject(method = "bootStrap", at = @At("HEAD"))
+    private static void doModernFixBootstrap(CallbackInfo ci) {
+        if(!isBootstrapped) {
+            LOGGER.info("ModernFix bootstrap");
+            ModWorkManagerQueue.replace();
+        }
+    }
+}
diff --git a/src/main/resources/modernfix.mixins.json b/src/main/resources/modernfix.mixins.json
index e091cdb4..5cb83fa3 100644
--- a/src/main/resources/modernfix.mixins.json
+++ b/src/main/resources/modernfix.mixins.json
@@ -6,6 +6,7 @@
   "compatibilityLevel": "JAVA_8",
   "refmap": "modernfix.refmap.json",
   "mixins": [
+    "core.BootstrapMixin",
     "bugfix.edge_chunk_not_saved.ChunkManagerMixin",
     "bugfix.starlight_emptiness.StarLightEngineMixin",
     "perf.dynamic_structure_manager.StructureManagerMixin",