diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java
index b944f639..17deeb1a 100644
--- a/src/engine/server/world/WorldServer.java
+++ b/src/engine/server/world/WorldServer.java
@@ -281,6 +281,9 @@ public class WorldServer {
 		Logger.info("Initialize database layer");
 		initDatabaselayer();
 
+		Logger.info("Starting network Dispatcher");
+		DispatchMessage.startMessagePump();
+
 		Logger.info("Setting cross server session behavior");
 		SessionManager.setCrossServerBehavior(1); // Sets cross server behavior
 
@@ -464,9 +467,6 @@ public class WorldServer {
 		Logger.info("Initializing Client Connection Manager");
 		initClientConnectionManager();
 
-		Logger.info("Starting message pumps");
-		DispatchMessage.startMessagePump();
-
 		// Run maintenance
 
 		MaintenanceManager.dailyMaintenance();