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 e542c1be..7ea9bcef 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
@@ -622,8 +622,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
     {
         Preconditions.checkState( thisState == State.CONFIGURING, "Not expecting CONFIGURING" );
 
-        finish2();
         ch.setEncodeProtocol( Protocol.CONFIGURATION );
+        finish2();
     }
 
     private void finish2()