diff --git a/src/server/Server.cpp b/src/server/Server.cpp
index 45e0357..b34dfd5 100644
--- a/src/server/Server.cpp
+++ b/src/server/Server.cpp
@@ -161,7 +161,9 @@ void Server::BroadcastPacket(const protocol::Packet* packet) {
 }
 
 void Server::RemoveConnexion(std::uint8_t connexionID) {
-	GetPlayers().erase(GetPlayers().find(connexionID));
+	auto it = GetPlayers().find(connexionID);
+	if (it != GetPlayers().end())
+		GetPlayers().erase(it);
 	m_Connections.erase(connexionID);
 	m_Lobby.OnPlayerLeave(connexionID);
 	OnPlayerLeave(connexionID);