diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
index 52543532e..0467b610f 100644
--- a/src/game/server/player.cpp
+++ b/src/game/server/player.cpp
@@ -933,13 +933,18 @@ void CPlayer::ProcessScoreResult(CScorePlayerResult &Result)
 			}
 			break;
 		case CScorePlayerResult::ALL:
+		{
+			int MessageClientId = m_ClientID;
 			for(auto &aMessage : Result.m_Data.m_aaMessages)
 			{
 				if(aMessage[0] == 0)
 					break;
-				GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aMessage, -1);
+
+				GameServer()->SendChat(-1, CGameContext::CHAT_ALL, aMessage, MessageClientId);
+				MessageClientId = -1; // Prevent multi-messages being flagged as spam.
 			}
 			break;
+		}		
 		case CScorePlayerResult::BROADCAST:
 			if(Result.m_Data.m_Broadcast[0] != 0)
 				GameServer()->SendBroadcast(Result.m_Data.m_Broadcast, -1);
diff --git a/src/game/server/score.cpp b/src/game/server/score.cpp
index dc3879703..3e0dff4e9 100644
--- a/src/game/server/score.cpp
+++ b/src/game/server/score.cpp
@@ -1024,7 +1024,7 @@ bool CScore::ShowTopThread(IDbConnection *pSqlServer, const ISqlData *pGameData,
 	}
 	pSqlServer->BindString(1, pData->m_Map);
 	pSqlServer->BindString(2, aServerLike);
-	
+
 	str_format(pResult->m_Data.m_aaMessages[Line], sizeof(pResult->m_Data.m_aaMessages[Line]),
 		"-----------< %s Top 3 >-----------", pData->m_Server);
 	Line++;