diff --git a/src/main/java/ru/betterend/complexmaterials/MetalMaterial.java b/src/main/java/ru/betterend/complexmaterials/MetalMaterial.java
index bb31ef59..2144aed5 100644
--- a/src/main/java/ru/betterend/complexmaterials/MetalMaterial.java
+++ b/src/main/java/ru/betterend/complexmaterials/MetalMaterial.java
@@ -14,7 +14,6 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.material.MaterialColor;
 import ru.bclib.api.tag.NamedBlockTags;
 import ru.bclib.api.tag.NamedCommonBlockTags;
-import ru.bclib.api.tag.NamedCommonItemTags;
 import ru.bclib.api.tag.NamedItemTags;
 import ru.bclib.api.tag.TagAPI;
 import ru.bclib.api.tag.TagAPI.TagNamed;
@@ -496,6 +495,5 @@ public class MetalMaterial {
 		TagAPI.addBlockTag(NamedBlockTags.BEACON_BASE_BLOCKS, block);
 		TagAPI.addItemTag(NamedItemTags.BEACON_PAYMENT_ITEMS, ingot);
 		TagAPI.addBlockTag(NamedCommonBlockTags.DRAGON_IMMUNE, ore, bars);
-		TagAPI.addItemTag(NamedCommonItemTags.HAMMERS, hammer);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/ru/betterend/item/tool/EndHammerItem.java b/src/main/java/ru/betterend/item/tool/EndHammerItem.java
index cc5cfa57..b4907e85 100644
--- a/src/main/java/ru/betterend/item/tool/EndHammerItem.java
+++ b/src/main/java/ru/betterend/item/tool/EndHammerItem.java
@@ -24,16 +24,21 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Tier;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import ru.bclib.api.tag.CommonItemTags;
+import ru.bclib.api.tag.NamedCommonItemTags;
+import ru.bclib.api.tag.TagAPI.TagLocation;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.interfaces.ItemModelProvider;
+import ru.bclib.interfaces.TagProvider;
 
+import java.util.List;
 import java.util.UUID;
 
-public class EndHammerItem extends DiggerItem implements DynamicAttributeTool, ItemModelProvider {
+public class EndHammerItem extends DiggerItem implements DynamicAttributeTool, ItemModelProvider, TagProvider {
 	public final static UUID ATTACK_KNOCKBACK_MODIFIER_ID = Mth.createInsecureUUID(ThreadLocalRandom.current());
 	
 	private final Multimap<Attribute, AttributeModifier> attributeModifiers;
@@ -161,4 +166,9 @@ public class EndHammerItem extends DiggerItem implements DynamicAttributeTool, I
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {
 		return ModelsHelper.createHandheldItem(resourceLocation);
 	}
+	
+	@Override
+	public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
+		itemTags.add(NamedCommonItemTags.HAMMERS);
+	}
 }