diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/EntityPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/EntityPacketRewriter1_21_2.java
index a4dba4b00..ebb4e35eb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/EntityPacketRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/EntityPacketRewriter1_21_2.java
@@ -336,9 +336,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
         filter().type(EntityTypes1_21_2.ABSTRACT_BOAT).removeIndex(11); // Goodbye boat type
 
         filter().type(EntityTypes1_21_2.SALMON).addIndex(17); // Data type
-        filter().type(EntityTypes1_21_2.DOLPHIN).addIndex(16); // Baby
-        filter().type(EntityTypes1_21_2.GLOW_SQUID).addIndex(16); // Baby
-        filter().type(EntityTypes1_21_2.SQUID).addIndex(16); // Baby
+        filter().type(EntityTypes1_21_2.AGEABLE_WATER_CREATURE).addIndex(16); // Baby
 
         filter().type(EntityTypes1_21_2.ABSTRACT_ARROW).addIndex(10); // In ground
     }