diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 03ddc8da86..cd40d4793a 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -263,18 +263,26 @@ namespace osu.Game
                 return;
             }
 
-            var score = ScoreManager.GetScore(scoreInfo);
-            if (score.Replay == null)
+            var databasedScore = ScoreManager.GetScore(score);
+            var databasedScoreInfo = databasedScore.ScoreInfo;
+            if (databasedScore.Replay == null)
             {
                 Logger.Log("The loaded score has no replay data.", LoggingTarget.Information);
                 return;
             }
 
+            var databasedBeatmap = BeatmapManager.QueryBeatmap(b => b.ID == databasedScoreInfo.Beatmap.ID);
+            if (databasedBeatmap == null)
+            {
+                Logger.Log("Tried to load a score for a beatmap we don't have!", LoggingTarget.Information);
+                return;
+            }
+
             if (!currentScreen.AllowExternalScreenChange)
             {
                 notifications.Post(new SimpleNotification
                 {
-                    Text = $"Click here to watch {scoreInfo.User.Username} on {scoreInfo.BeatmapInfo}",
+                    Text = $"Click here to watch {databasedScoreInfo.User.Username} on {databasedScoreInfo.Beatmap}",
                     Activated = () =>
                     {
                         loadScore();
@@ -296,19 +304,12 @@ namespace osu.Game
                     return;
                 }
 
-                var databasedBeatmap = BeatmapManager.QueryBeatmap(b => b.ID == scoreInfo.BeatmapInfo.ID);
-                if (databasedBeatmap == null)
-                {
-                    Logger.Log("Tried to load a score for a beatmap we don't have!", LoggingTarget.Information);
-                    return;
-                }
-
-                ruleset.Value = score.Ruleset;
+                ruleset.Value = databasedScoreInfo.Ruleset;
 
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
-                Beatmap.Value.Mods.Value = score.Mods;
+                Beatmap.Value.Mods.Value = databasedScoreInfo.Mods;
 
-                currentScreen.Push(new PlayerLoader(new ReplayPlayer(score)));
+                currentScreen.Push(new PlayerLoader(new ReplayPlayer(databasedScore)));
             }
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 136f015080..01721775a0 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -291,7 +291,7 @@ namespace osu.Game.Screens.Play
         {
             var score = new ScoreInfo
             {
-                BeatmapInfo = Beatmap.Value.BeatmapInfo,
+                Beatmap = Beatmap.Value.BeatmapInfo,
                 Ruleset = ruleset,
                 User = api.LocalUser.Value
             };