diff --git a/paper-server/patches/sources/net/minecraft/network/syncher/SynchedEntityData.java.patch b/paper-server/patches/sources/net/minecraft/network/syncher/SynchedEntityData.java.patch
index ac8c137be495..ea9d95ec4b3e 100644
--- a/paper-server/patches/sources/net/minecraft/network/syncher/SynchedEntityData.java.patch
+++ b/paper-server/patches/sources/net/minecraft/network/syncher/SynchedEntityData.java.patch
@@ -23,7 +23,7 @@
      public boolean isDirty() {
          return this.isDirty;
      }
-@@ -169,6 +_,20 @@
+@@ -169,6 +_,19 @@
              return new SynchedEntityData(this.entity, this.itemsById);
          }
      }
@@ -31,9 +31,8 @@
 +    // Paper start
 +    // We need to pack all as we cannot rely on "non default values" or "dirty" ones.
 +    // Because these values can possibly be desynced on the client.
-+    @Nullable
 +    public List<SynchedEntityData.DataValue<?>> packAll() {
-+        final List<SynchedEntityData.DataValue<?>> list = new ArrayList<>();
++        final List<SynchedEntityData.DataValue<?>> list = new ArrayList<>(this.itemsById.length);
 +        for (final DataItem<?> dataItem : this.itemsById) {
 +            list.add(dataItem.value());
 +        }