diff --git a/src/main/java/org/betterx/bclib/client/BCLibClient.java b/src/main/java/org/betterx/bclib/client/BCLibClient.java
index ac41313e..5fab2eb2 100644
--- a/src/main/java/org/betterx/bclib/client/BCLibClient.java
+++ b/src/main/java/org/betterx/bclib/client/BCLibClient.java
@@ -22,16 +22,24 @@ import net.fabricmc.fabric.api.client.model.*;
 import org.jetbrains.annotations.Nullable;
 
 public class BCLibClient implements ClientModInitializer, ModelResourceProvider, ModelVariantProvider {
-    public static CustomModelBakery modelBakery;
+    private static CustomModelBakery modelBakery;
+
+    public static CustomModelBakery lazyModelbakery() {
+        if (modelBakery == null) {
+            modelBakery = new CustomModelBakery();
+        }
+        return modelBakery;
+    }
 
     @Override
     public void onInitializeClient() {
+        modelBakery = new CustomModelBakery();
+
         WorldsTogetherClient.onInitializeClient();
         ModIntegrationAPI.registerAll();
         BaseBlockEntityRenders.register();
         DataExchangeAPI.prepareClientside();
         PostInitAPI.postInit(true);
-        modelBakery = new CustomModelBakery();
         ModelLoadingRegistry.INSTANCE.registerResourceProvider(rm -> this);
         ModelLoadingRegistry.INSTANCE.registerVariantProvider(rm -> this);
 
diff --git a/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java b/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java
index 0cfd30ed..78d75184 100644
--- a/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java
+++ b/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java
@@ -27,7 +27,6 @@ public class ModelManagerMixin {
             Executor executor2,
             CallbackInfoReturnable<CompletableFuture<Void>> cir
     ) {
-        //TODO: 1.20 check
-        BCLibClient.modelBakery.loadCustomModels(resourceManager);
+        BCLibClient.lazyModelbakery().loadCustomModels(resourceManager);
     }
 }