diff --git a/patches/server/0551-Fix-item-default-attributes-API.patch b/patches/server/0551-Fix-item-default-attributes-API.patch
index 7bc3c4f579..b273334b02 100644
--- a/patches/server/0551-Fix-item-default-attributes-API.patch
+++ b/patches/server/0551-Fix-item-default-attributes-API.patch
@@ -5,6 +5,24 @@ Subject: [PATCH] Fix item default attributes API
 
 (previously added this API but upstream also added it)
 
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java
+index f5bb5802aae64773252c9399df0fbe9de3d1d121..566ac7873eb1bd39479e9d1404e124af235b6fcb 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java
+@@ -189,9 +189,10 @@ public class CraftItemType<M extends ItemMeta> implements ItemType.Typed<M>, Han
+ 
+     @Override
+     public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlot slot) {
+-        ImmutableMultimap.Builder<Attribute, AttributeModifier> defaultAttributes = ImmutableMultimap.builder();
+-
+-        ItemAttributeModifiers nmsDefaultAttributes = this.item.getDefaultAttributeModifiers();
++        // Paper start - fix item default attribute API
++        final ImmutableMultimap.Builder<Attribute, AttributeModifier> defaultAttributes = ImmutableMultimap.builder();
++        ItemAttributeModifiers nmsDefaultAttributes = this.item.components().getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY);
++        // Paper end - fix item default attribute API
+         nmsDefaultAttributes.forEach(CraftEquipmentSlot.getNMS(slot), (key, value) -> {
+             Attribute attribute = CraftAttribute.minecraftToBukkit(key.value());
+             defaultAttributes.put(attribute, CraftAttributeInstance.convert(value, slot));
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 index 952a8147947fa0e2a960628fc760212d3d206ce6..27acc1965e16d697fa98f64cf64ecc6ecd775e86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java