diff --git a/patches/server/General-ItemMeta-fixes.patch b/patches/server/General-ItemMeta-fixes.patch
index 23d7f460477..6033d1e1cb2 100644
--- a/patches/server/General-ItemMeta-fixes.patch
+++ b/patches/server/General-ItemMeta-fixes.patch
@@ -75,8 +75,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      @Override
      public void removeEnchantments() {
+-        this.handle.remove(DataComponents.ENCHANTMENTS);
 +        if (this.handle != null) { // Paper - fix NPE
-         this.handle.remove(DataComponents.ENCHANTMENTS);
++        this.handle.set(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY); // Paper - set to default instead of removing the component
 +        } // Paper
      }