diff --git a/src/playerdata.cpp b/src/playerdata.cpp
index 48eed064..83349b0a 100644
--- a/src/playerdata.cpp
+++ b/src/playerdata.cpp
@@ -292,6 +292,8 @@ LOG_ERROR("checking IsPlayerAllowedToJoinCreateLimitRank() ");
 		}else{
 			LOG_ERROR("erasing overdued timestamp " << *timeStamp);
 			timeStamp = m_last_games.erase(timeStamp); // erase overdued entries
+			if( timeStamp == m_last_games.end())
+				break;
 		}
 		i++;
 	}