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 a2bb7c57..f4ae9a31 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
@@ -372,6 +372,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                             {
                                 server = AbstractReconnectHandler.getForcedHost( InitialHandler.this );
                             }
+                            if ( server == null )
+                            {
+                                server = bungee.getServerInfo( listener.getDefaultServer() );
+                            }
+
                             userCon.connect( server, null, true );
 
                             thisState = State.FINISHED;