diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 0f158a6550..b58a01c6dd 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -138,7 +138,7 @@ public void disconnected(ChannelWrapper channel) throws Exception
     {
         user.getPendingConnects().remove( target );
 
-        if ( !obsolete && user.getPendingConnects().isEmpty() && thisState == State.LOGIN_SUCCESS )
+        if ( user.getServer() == null && !obsolete && user.getPendingConnects().isEmpty() && thisState == State.LOGIN_SUCCESS )
         {
             // this is called if we get disconnected but not have received any response after we send the handshake
             // in this case probably an exception was thrown because the handshake could not be read correctly