diff --git a/core/Callbacks/Callbacks.php b/core/Callbacks/Callbacks.php
index 75b3fab8..a458083c 100644
--- a/core/Callbacks/Callbacks.php
+++ b/core/Callbacks/Callbacks.php
@@ -70,6 +70,12 @@ interface Callbacks {
 	/** EndWarmup Callback */
 	const ENDWARMUP = 'Callbacks.EndWarmUp';
 
+	/** Scores Callback (returned after LibXmlRpc_PlayerRanking): Scores */
+	const SCORESREADY = 'Callbacks.ScoresReady';
+
+	/** Scores Callback (returned after LibXmlRpc_PlayerRanking in SM, or LibXmlRpc_TeamsScores in Trackmania): Scores */
+	const SCORES = 'Callbacks.Scores';
+
 	/** PlayerRanking Callback, returned after LibXmlRpc_PlayerRanking
 	 * try to avoid to use this, just use the Get function of the RankingsManager instead
 	 * param1 Player $player
@@ -83,8 +89,6 @@ interface Callbacks {
 	 */
 	/** RankingsUpdated Callback: SortedRankings */
 	const RANKINGSUPDATED = 'Callbacks.RankingsUpdated';
-	/** Scores Callback (returned after LibXmlRpc_PlayerRanking): Scores */
-	const SCORES = 'Callbacks.Scores';
 
 	/** Returns the AFKStatus of an Player, returned after  param1 Scores */ //returned after TODO
 	const AFKSTATUS = 'Callbacks.AfkStatus';
diff --git a/core/Callbacks/LibXmlRpcCallbacks.php b/core/Callbacks/LibXmlRpcCallbacks.php
index b58c2de0..2ff97ad1 100644
--- a/core/Callbacks/LibXmlRpcCallbacks.php
+++ b/core/Callbacks/LibXmlRpcCallbacks.php
@@ -149,6 +149,12 @@ class LibXmlRpcCallbacks implements CallbackListener {
 				$player = $this->maniaControl->getPlayerManager()->getPlayer($data[0]);
 				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ONPLAYERREQUESTRESPAWN, $player);
 				break;
+			case 'LibXmlRpc_Scores':
+				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::SCORES, $data);
+				break;
+			case 'LibXmlRpc_ScoresReady':
+				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::SCORESREADY, $data);
+				break;
 		}
 	}
 
diff --git a/core/Callbacks/ShootManiaCallbacks.php b/core/Callbacks/ShootManiaCallbacks.php
index 7f01e3e3..4aa5cf82 100644
--- a/core/Callbacks/ShootManiaCallbacks.php
+++ b/core/Callbacks/ShootManiaCallbacks.php
@@ -52,9 +52,6 @@ class ShootManiaCallbacks implements CallbackListener {
 			case 'LibXmlRpc_Rankings':
 				$this->maniaControl->getServer()->getRankingManager()->updateRankings($data[0]);
 				break;
-			case 'LibXmlRpc_Scores':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::SCORES, $data);
-				break;
 			case 'LibAFK_IsAFK':
 				$this->triggerAfkStatus($data[0]);
 				break;