diff --git a/src/main/java/org/betterx/betterend/BetterEnd.java b/src/main/java/org/betterx/betterend/BetterEnd.java
index 1ffa9c24..6e9407ab 100644
--- a/src/main/java/org/betterx/betterend/BetterEnd.java
+++ b/src/main/java/org/betterx/betterend/BetterEnd.java
@@ -10,6 +10,7 @@ import org.betterx.betterend.effects.EndPotions;
 import org.betterx.betterend.integration.Integrations;
 import org.betterx.betterend.recipe.builders.InfusionRecipe;
 import org.betterx.betterend.registry.*;
+import org.betterx.betterend.tab.CreativeTabs;
 import org.betterx.betterend.util.BonemealPlants;
 import org.betterx.betterend.util.LootTableUtil;
 import org.betterx.betterend.world.generator.EndLandBiomeDecider;
@@ -60,6 +61,7 @@ public class BetterEnd implements ModInitializer {
                     .forEach(BetterEndPlugin::register);
         Integrations.init();
         Configs.saveConfigs();
+        CreativeTabs.ensureStaticallyLoaded();
 
         if (GeneratorOptions.useNewGenerator()) {
             BiomeDecider.registerHighPriorityDecider(makeID("end_land"), new EndLandBiomeDecider());
diff --git a/src/main/java/org/betterx/betterend/registry/EndBlocks.java b/src/main/java/org/betterx/betterend/registry/EndBlocks.java
index cef43c4e..e72aee0e 100644
--- a/src/main/java/org/betterx/betterend/registry/EndBlocks.java
+++ b/src/main/java/org/betterx/betterend/registry/EndBlocks.java
@@ -10,7 +10,6 @@ import org.betterx.betterend.complexmaterials.*;
 import org.betterx.betterend.config.Configs;
 import org.betterx.betterend.item.material.EndArmorMaterial;
 import org.betterx.betterend.item.material.EndToolMaterial;
-import org.betterx.betterend.tab.CreativeTabs;
 import org.betterx.worlds.together.tag.v3.CommonBlockTags;
 import org.betterx.worlds.together.tag.v3.TagManager;
 
@@ -27,7 +26,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 public class EndBlocks {
-    private static final BlockRegistry REGISTRY = new BlockRegistry(CreativeTabs.TAB_BLOCKS, Configs.BLOCK_CONFIG);
+    private static final BlockRegistry REGISTRY = new BlockRegistry(Configs.BLOCK_CONFIG);
 
     // Terrain //
     public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new EndstoneDustBlock());
diff --git a/src/main/java/org/betterx/betterend/registry/EndItems.java b/src/main/java/org/betterx/betterend/registry/EndItems.java
index f2a0175e..dec82f8f 100644
--- a/src/main/java/org/betterx/betterend/registry/EndItems.java
+++ b/src/main/java/org/betterx/betterend/registry/EndItems.java
@@ -15,7 +15,6 @@ import org.betterx.betterend.item.material.EndArmorMaterial;
 import org.betterx.betterend.item.material.EndToolMaterial;
 import org.betterx.betterend.item.tool.EndHammerItem;
 import org.betterx.betterend.item.tool.EndPickaxe;
-import org.betterx.betterend.tab.CreativeTabs;
 
 import net.minecraft.core.Holder;
 import net.minecraft.sounds.SoundEvent;
@@ -32,7 +31,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 public class EndItems {
-    private static final ItemRegistry REGISTRY = new ItemRegistry(CreativeTabs.TAB_ITEMS, Configs.ITEM_CONFIG);
+    private static final ItemRegistry REGISTRY = new ItemRegistry(Configs.ITEM_CONFIG);
 
     // Materials //
     public final static Item ENDER_DUST = registerEndItem("ender_dust");
diff --git a/src/main/java/org/betterx/betterend/tab/CreativeTabs.java b/src/main/java/org/betterx/betterend/tab/CreativeTabs.java
index 3b815f93..fd6b27e8 100644
--- a/src/main/java/org/betterx/betterend/tab/CreativeTabs.java
+++ b/src/main/java/org/betterx/betterend/tab/CreativeTabs.java
@@ -15,6 +15,10 @@ public class CreativeTabs {
     public static final CreativeModeTab TAB_BLOCKS;
     public static final CreativeModeTab TAB_ITEMS;
 
+    public static void ensureStaticallyLoaded() {
+        // NO-OP
+    }
+
     static {
         TAB_BLOCKS = FabricItemGroup
                 .builder(BetterEnd.makeID("end_blocks"))