diff --git a/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java b/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
index b7bcc8411..1701ac9cf 100644
--- a/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
+++ b/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
@@ -647,8 +647,11 @@ public boolean handleServerHandshake(C00Handshake packet, NetworkManager manager
         if (!shouldAllowPlayerLogins())
         {
             TextComponentString text = new TextComponentString("Server is still starting! Please wait before reconnecting.");
-            FMLLog.log.info("Disconnecting Player: {}", text.getUnformattedText());
-            manager.sendPacket(new SPacketDisconnect(text));
+            if (packet.getRequestedState() != EnumConnectionState.STATUS)
+            {
+                FMLLog.log.info("Disconnecting Player: {}", text.getUnformattedText());
+                manager.sendPacket(new SPacketDisconnect(text));
+            }
             manager.closeChannel(text);
             return false;
         }