diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
index 28dd1ca5..9ecb0f2f 100644
--- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
+++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
@@ -73,7 +73,8 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
         this.bakery = bakery;
         this.bakedCache = cache;
         this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>());
-        currentInstance = this;
+        if(currentInstance == null)
+            currentInstance = this;
     }
 
     public void setMissingModel(BakedModel model) {
diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
index 12c30ce1..5e614c9b 100644
--- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
+++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
@@ -350,6 +350,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
         this.topLevelModels.clear();
         this.topLevelModels.put(MISSING_MODEL_LOCATION, this.missingModel);
         this.smallLoadingCache.clear();
+        DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
     }
 
     /**
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
index 9362b008..66ab29ad 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
@@ -203,6 +203,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
         profiler.pop();
         // ensure missing model is a permanent override
         this.bakedTopLevelModels.put(MISSING_MODEL_LOCATION, this.getBakedModel(MISSING_MODEL_LOCATION, BlockModelRotation.X0_Y0, this.atlasSet::getSprite));
+        DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
         cir.setReturnValue(atlasSet);
     }