diff --git a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java b/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
index 007ae53b60..7d88e96e47 100644
--- a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
+++ b/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
@@ -157,8 +157,8 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet<?>> im
         {
             serverInitiateHandshake();
             FMLLog.log.info("Connection received without FML marker, assuming vanilla.");
-            this.completeServerSideConnection(ConnectionType.VANILLA);
             insertIntoChannel();
+            this.completeServerSideConnection(ConnectionType.VANILLA);
         }
     }