diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
index 783441a6..1447ee3c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
@@ -153,6 +153,8 @@ public class Tablist extends ChannelInboundHandlerAdapter {
                 directTabItems.clear();
                 sendTabPacket(current, null);
                 current.clear();
+                // TODO: Misformed Team Packet?
+                return;
             }
 
             sendPacket(player, createTeamPacket);