diff --git a/minecraft-data-api b/minecraft-data-api
index ef372f5e..e530e31c 160000
--- a/minecraft-data-api
+++ b/minecraft-data-api
@@ -1 +1 @@
-Subproject commit ef372f5e360b30712ea8b7da0c20f62b05c595f8
+Subproject commit e530e31c62839cda74a29a9bd22de937b5e32efb
diff --git a/velocity/src/main/java/codecrafter47/bungeetablistplus/protocol/PacketListener.java b/velocity/src/main/java/codecrafter47/bungeetablistplus/protocol/PacketListener.java
index 672925ac..5be400d6 100644
--- a/velocity/src/main/java/codecrafter47/bungeetablistplus/protocol/PacketListener.java
+++ b/velocity/src/main/java/codecrafter47/bungeetablistplus/protocol/PacketListener.java
@@ -51,29 +51,24 @@ protected void decode(ChannelHandlerContext ctx, MinecraftPacket packet, List<Ob
                 if (packet != null) {
 
                     PacketListenerResult result = PacketListenerResult.PASS;
-                    boolean handled = false;
 
                     if (packet instanceof Team) {
                         result = handler.onTeamPacket((Team) packet);
-                        if (result == PacketListenerResult.MODIFIED) {
-                            sendPacket(player, packet);
-                        }
                     } else if (packet instanceof LegacyPlayerListItemPacket) {
                         result = handler.onPlayerListPacket((LegacyPlayerListItemPacket) packet);
-                        handled = true;
                     } else if (packet instanceof HeaderAndFooterPacket) {
                         result = handler.onPlayerListHeaderFooterPacket((HeaderAndFooterPacket) packet);
-                        handled = true;
                     } else if (packet instanceof UpsertPlayerInfoPacket) {
                         result = handler.onPlayerListUpdatePacket((UpsertPlayerInfoPacket) packet);
-                        handled = true;
                     } else if (packet instanceof RemovePlayerInfoPacket) {
                         result = handler.onPlayerListRemovePacket((RemovePlayerInfoPacket) packet);
-                        handled = true;
                     }
 
-                    if (handled && result != PacketListenerResult.CANCEL) {
-                        sendPacket(player, packet);
+                    if (result != PacketListenerResult.PASS) {
+                        if (result == PacketListenerResult.MODIFIED) {
+                            sendPacket(player, packet);
+                        }
+                        return;
                     }
                 }
             }