diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
index 019f070a214c..43bb2d95bc37 100644
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -274,6 +274,8 @@ public Server(List<IPEndPoint> endpoints, ServerSettings settings, ModData modDa
 					if (LobbyInfo.GlobalSettings.UseNewNetcode && State == ServerState.GameStarted)
 					{
 						localTimeout = serverGame.MillisToNextNetFrame * 1000;
+						if (localTimeout < 0)
+							localTimeout = 0;
 					}
 					else
 					{