diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
index 205335d5..8c3b8d26 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
@@ -464,8 +464,13 @@ public class EntityPackets1_13 extends EntityRewriter<Protocol1_12_2To1_13> {
         // Remove boat splash timer
         registerMetaHandler().filter(EntityType.BOAT, 12).removed();
 
+        //Remove shooter UUID
+        registerMetaHandler().filter(EntityType.ABSTRACT_ARROW, true, 7).removed();
+
+        registerMetaHandler().filter(EntityType.SPECTRAL_ARROW, 8).handleIndexChange(8);
+
         // Remove Trident special loyalty level
-        registerMetaHandler().filter(EntityType.TRIDENT, 7).removed();
+        registerMetaHandler().filter(EntityType.TRIDENT, 8).removed();
 
         // Handle new wolf colors
         registerMetaHandler().filter(EntityType.WOLF, 17).handle(e -> {