diff --git a/src/server/ServerConnexion.cpp b/src/server/ServerConnexion.cpp
index 131245b..bba1aa3 100644
--- a/src/server/ServerConnexion.cpp
+++ b/src/server/ServerConnexion.cpp
@@ -119,12 +119,12 @@ void ServerConnexion::HandlePacket(const protocol::PlayerLoginPacket* packet) {
 		protocol::UpdateGameStatePacket statePacket(m_Server->GetGame().GetGameState());
 		SendPacket(&statePacket);
 
+		m_Server->GetGame().NotifyListeners(&game::GameListener::OnPlayerJoin, m_ID);
+		
 		protocol::WorldBeginDataPacket headerDataPacket(m_Server->GetGame().GetWorld());
 		protocol::WorldDataPacket dataPacket(m_Server->GetGame().GetWorld());
 		SendPacket(&headerDataPacket);
 		SendPacket(&dataPacket);
-
-		m_Server->GetGame().NotifyListeners(&game::GameListener::OnPlayerJoin, m_ID);
 	}
 }