diff --git a/patches/server/General-ItemMeta-fixes.patch b/patches/server/General-ItemMeta-fixes.patch
index 687360564d..99611a2d16 100644
--- a/patches/server/General-ItemMeta-fixes.patch
+++ b/patches/server/General-ItemMeta-fixes.patch
@@ -258,6 +258,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
          <T> Applicator put(ItemMetaKeyType<T> key, T value) {
              this.builder.set(key.TYPE, value);
+@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+ 
+     void applyModifiers(Multimap<Attribute, AttributeModifier> modifiers, CraftMetaItem.Applicator tag) {
+         if (modifiers == null || modifiers.isEmpty()) {
+-            if (this.hasItemFlag(ItemFlag.HIDE_ATTRIBUTES)) {
+-                tag.put(CraftMetaItem.ATTRIBUTES, new ItemAttributeModifiers(Collections.emptyList(), false));
+-            }
++            // Paper - don't save ItemFlag if the underlying data isn't present
+             return;
+         }
+ 
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
      @Override
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 666f091c61..66fd94322c 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 666f091c61cefb90f6903a66e5426d15d948b1c0
+Subproject commit 66fd94322c5b1b8eb474c7a95aed9d048f995803