diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index af1051c4e..dfca811da 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -1728,7 +1728,7 @@ void CServer::CacheServerInfo(CCache *pCache, int Type, bool SendClients)
 
 			if(Type == SERVERINFO_EXTENDED)
 			{
-				if(pp.Size() >= NET_MAX_PAYLOAD)
+				if(pp.Size() >= NET_MAX_PAYLOAD - 18) // 8 bytes for type, 10 bytes for the largest token
 				{
 					// Retry current player.
 					i--;