diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ClickableUsername.cs b/osu.Game/Overlays/BeatmapSet/Scores/ClickableUsername.cs
index 0aa1fae12f..762e3f0105 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ClickableUsername.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ClickableUsername.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             };
         }
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(UserProfileOverlay profile)
         {
             this.profile = profile;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 0f25021cf5..164823f105 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         {
             request?.Cancel();
 
-            if (beatmap == null)
+            if (!beatmap?.OnlineBeatmapID.HasValue ?? false)
             {
                 clearAllScores();
                 return;