diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
index 6e068812..ae960fed 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
+++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
@@ -65,7 +65,7 @@ public class HexItems {
     public static final ItemSlate SLATE = make("slate", new ItemSlate(HexBlocks.SLATE, props()));
 
     public static final ItemManaBattery BATTERY = make("battery",
-        new ItemManaBattery(new Item.Properties().stacksTo(1)));
+        new ItemManaBattery(unstackable()));
 
     public static final EnumMap<DyeColor, ItemDyeColorizer> DYE_COLORIZERS = Util.make(() -> {
         var out = new EnumMap<DyeColor, ItemDyeColorizer>(DyeColor.class);
diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java
index 0bc3a65b..6fd814d9 100644
--- a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java
+++ b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java
@@ -6,10 +6,12 @@ import at.petrak.hexcasting.common.recipe.BrainsweepRecipe;
 import at.petrak.hexcasting.common.recipe.HexRecipeSerializers;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
+import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter;
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.api.registration.IRecipeCatalystRegistration;
 import mezz.jei.api.registration.IRecipeCategoryRegistration;
 import mezz.jei.api.registration.IRecipeRegistration;
+import mezz.jei.api.registration.ISubtypeRegistration;
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
@@ -31,6 +33,15 @@ public class HexJEIPlugin implements IModPlugin {
         return UID;
     }
 
+    @Override
+    public void registerItemSubtypes(@NotNull ISubtypeRegistration registration) {
+        registration.registerSubtypeInterpreter(HexItems.BATTERY, (itemStack, ctx) -> {
+            if (!itemStack.hasTag()) {
+                return IIngredientSubtypeInterpreter.NONE;
+            }
+            return String.valueOf(HexItems.BATTERY.getMaxMana(itemStack));
+        });
+    }
 
     @Override
     public void registerCategories(IRecipeCategoryRegistration registration) {