diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index f69c5363..93f19ac6 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -537,7 +537,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                 @Override
                 public void run()
                 {
-                    unsafe().sendPacket( new Kick( ComponentSerializer.toString( reason ) ) );
+                    if (thisState != State.STATUS && thisState != State.PING)
+                    {
+                        unsafe().sendPacket( new Kick( ComponentSerializer.toString( reason ) ) );
+                    }
                     ch.close();
                 }
             }, 500, TimeUnit.MILLISECONDS );