diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
index 1d8a0738..1c5b74c5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
@@ -172,8 +172,10 @@ public class Tablist extends ChannelInboundHandlerAdapter {
         sendTabPacket(current, null);
         current.clear();
 
-        if(connection != null)
+        if(connection != null) {
             connection.getConnection().getChannel().pipeline().remove(this);
+            connection = null;
+        }
     }
 
     @Override