diff --git a/src/main/java/xyz/nucleoid/disguiselib/impl/mixin/ServerPlayNetworkHandlerMixin_Disguiser.java b/src/main/java/xyz/nucleoid/disguiselib/impl/mixin/ServerPlayNetworkHandlerMixin_Disguiser.java
index 94bc962..35cd760 100644
--- a/src/main/java/xyz/nucleoid/disguiselib/impl/mixin/ServerPlayNetworkHandlerMixin_Disguiser.java
+++ b/src/main/java/xyz/nucleoid/disguiselib/impl/mixin/ServerPlayNetworkHandlerMixin_Disguiser.java
@@ -83,9 +83,9 @@ public ServerPlayNetworkHandlerMixin_Disguiser(MinecraftServer server, ClientCon
                 if(original != null && ((EntityDisguise) original).isDisguised()) {
                     Entity disguised = ((EntityDisguise) original).getDisguiseEntity();
                     if(disguised != null) {
+                        remove.run();
                         ((DisguiseUtils) original).updateTrackedData();
-                        List<DataTracker.SerializedEntry<?>> trackedValues = disguised.getDataTracker().getChangedEntries();
-                        ((EntityTrackerUpdateS2CPacketAccessor) packet).setTrackedValues(trackedValues);
+                        add.accept(new EntityTrackerUpdateS2CPacket(entityId, disguised.getDataTracker().getChangedEntries()));
                     }
                 }
             }