diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index 4d574ff9ef..dd5a73817f 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -28,8 +28,11 @@ namespace osu.Game.Screens.Multi.Match.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            room.RoomID.BindValueChanged(_ =>
+            room.RoomID.BindValueChanged(id =>
             {
+                if (id == null)
+                    return;
+
                 Scores = null;
                 UpdateScores();
             }, true);