diff --git a/src/main/java/org/cyclops/integrateddynamics/RegistryEntries.java b/src/main/java/org/cyclops/integrateddynamics/RegistryEntries.java
index 2312019820e..a961cbbe0e8 100644
--- a/src/main/java/org/cyclops/integrateddynamics/RegistryEntries.java
+++ b/src/main/java/org/cyclops/integrateddynamics/RegistryEntries.java
@@ -85,6 +85,7 @@ public class RegistryEntries {
     public static final DeferredHolder<Block, Block> BLOCK_DELAY = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("integrateddynamics:delay"));
     public static final DeferredHolder<Block, BlockDryingBasin> BLOCK_DRYING_BASIN = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("integrateddynamics:drying_basin"));
     public static final DeferredHolder<Block, BlockEnergyBattery> BLOCK_ENERGY_BATTERY = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("integrateddynamics:energy_battery"));
+    public static final DeferredHolder<Block, BlockEnergyBattery> BLOCK_ENERGY_BATTERY_CREATIVE = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("integrateddynamics:energy_battery_creative"));
     public static final DeferredHolder<Block, BlockFluidLiquidChorus> BLOCK_FLUID_LIQUID_CHORUS = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("integrateddynamics:block_liquid_chorus"));
     public static final DeferredHolder<Block, BlockFluidMenrilResin> BLOCK_FLUID_MENRIL_RESIN = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("integrateddynamics:block_menril_resin"));
     public static final DeferredHolder<Block, Block> BLOCK_INVISIBLE_LIGHT = DeferredHolder.create(Registries.BLOCK, ResourceLocation.parse("integrateddynamics:invisible_light"));
diff --git a/src/main/java/org/cyclops/integrateddynamics/block/BlockCreativeEnergyBattery.java b/src/main/java/org/cyclops/integrateddynamics/block/BlockCreativeEnergyBattery.java
index a4fcb6bf457..60e519717bb 100644
--- a/src/main/java/org/cyclops/integrateddynamics/block/BlockCreativeEnergyBattery.java
+++ b/src/main/java/org/cyclops/integrateddynamics/block/BlockCreativeEnergyBattery.java
@@ -11,7 +11,7 @@
  */
 public class BlockCreativeEnergyBattery extends BlockEnergyBatteryBase {
 
-    public static final MapCodec<BlockCoalGenerator> CODEC = simpleCodec(BlockCoalGenerator::new);
+    public static final MapCodec<BlockCreativeEnergyBattery> CODEC = simpleCodec(BlockCreativeEnergyBattery::new);
 
     public BlockCreativeEnergyBattery(Block.Properties properties) {
         super(properties);
diff --git a/src/main/java/org/cyclops/integrateddynamics/blockentity/BlockEntityEnergyBatteryConfig.java b/src/main/java/org/cyclops/integrateddynamics/blockentity/BlockEntityEnergyBatteryConfig.java
index 5d638479a36..9368be0e6f7 100644
--- a/src/main/java/org/cyclops/integrateddynamics/blockentity/BlockEntityEnergyBatteryConfig.java
+++ b/src/main/java/org/cyclops/integrateddynamics/blockentity/BlockEntityEnergyBatteryConfig.java
@@ -21,7 +21,7 @@ public BlockEntityEnergyBatteryConfig() {
                 IntegratedDynamics._instance,
                 "energy_battery",
                 (eConfig) -> new BlockEntityType<>(BlockEntityEnergyBattery::new,
-                        Sets.newHashSet(RegistryEntries.BLOCK_ENERGY_BATTERY.get()), null)
+                        Sets.newHashSet(RegistryEntries.BLOCK_ENERGY_BATTERY.get(), RegistryEntries.BLOCK_ENERGY_BATTERY_CREATIVE.get()), null)
         );
         IntegratedDynamics._instance.getModEventBus().addListener(new BlockEntityEnergyBattery.CapabilityRegistrar(this::getInstance)::register);
     }