diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
index adc9cda5c..2fd281320 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
@@ -345,7 +345,12 @@ public class ComponentItemFactory1_20_5 extends BukkitItemFactory<ComponentItemW
 
     @Override
     protected void unbreakable(ComponentItemWrapper item, boolean unbreakable) {
-        item.setJavaComponent(ComponentTypes.UNBREAKABLE, unbreakable);
+        final Tag emptyTag = new CompoundTag();
+        if (unbreakable) {
+            item.setSparrowNBTComponent(ComponentTypes.UNBREAKABLE, emptyTag);
+        } else {
+            item.removeComponent(ComponentTypes.UNBREAKABLE);
+        }
     }
 
     @Override