diff --git a/src/main/java/org/adde0109/ambassador/forge/FML2CRPMClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/FML2CRPMClientConnectionPhase.java
index 433201a..c1a1ddf 100644
--- a/src/main/java/org/adde0109/ambassador/forge/FML2CRPMClientConnectionPhase.java
+++ b/src/main/java/org/adde0109/ambassador/forge/FML2CRPMClientConnectionPhase.java
@@ -77,8 +77,8 @@ public class FML2CRPMClientConnectionPhase extends VelocityForgeClientConnection
 
     this.clientPhase = this.clientPhase == ClientPhase.MODLIST ? ClientPhase.MODDED : ClientPhase.VANILLA;
 
-    connection.setSessionHandler(((VelocityForgeHandshakeSessionHandler) connection.getSessionHandler()).getOriginal());
     connection.setState(StateRegistry.PLAY);
+    connection.setSessionHandler(((VelocityForgeHandshakeSessionHandler) connection.getSessionHandler()).getOriginal());
     ((VelocityServer) Ambassador.getInstance().server).registerConnection(player);
 
     backupServer = null;