diff --git a/src/multiplay.cpp b/src/multiplay.cpp
index 29e1a646e83..47aff9dd3e3 100644
--- a/src/multiplay.cpp
+++ b/src/multiplay.cpp
@@ -147,13 +147,17 @@ void autoLagKickRoutine()
 	uint32_t totalNumPlayers = 0;
 
 	ingame.lastLagCheck = now;
-	uint32_t playerCheckLimit = (isInitialLoad) ? MAX_CONNECTED_PLAYERS : MAX_PLAYERS;
+	uint32_t playerCheckLimit = (isLobby || isInitialLoad) ? MAX_CONNECTED_PLAYERS : MAX_PLAYERS;
 	for (uint32_t i = 0; i < playerCheckLimit; ++i)
 	{
 		if (!isHumanPlayer(i))
 		{
 			continue;
 		}
+		if (i == NetPlay.hostPlayer)
+		{
+			continue;
+		}
 		if (i > MAX_PLAYERS && !gtimeShouldWaitForPlayer(i))
 		{
 			continue;