diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
index 088e46c7..57812113 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
@@ -575,9 +575,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
 
         filter().type(EntityTypes1_21_2.ABSTRACT_BOAT).addIndex(11); // Boat type
         filter().type(EntityTypes1_21_2.SALMON).removeIndex(17); // Data type
-        filter().type(EntityTypes1_21_2.DOLPHIN).removeIndex(16); // Baby
-        filter().type(EntityTypes1_21_2.GLOW_SQUID).removeIndex(16); // Baby
-        filter().type(EntityTypes1_21_2.SQUID).removeIndex(16); // Baby
+        filter().type(EntityTypes1_21_2.AGEABLE_WATER_CREATURE).removeIndex(16); // Baby
 
         filter().type(EntityTypes1_21_2.ABSTRACT_ARROW).removeIndex(10); // In ground
     }