diff --git a/osu.Game/Overlays/Profile/Sections/UnderscoredBeatmapLink.cs b/osu.Game/Overlays/Profile/Sections/UnderscoredBeatmapLink.cs
index 370d6d84ef..ddad99355c 100644
--- a/osu.Game/Overlays/Profile/Sections/UnderscoredBeatmapLink.cs
+++ b/osu.Game/Overlays/Profile/Sections/UnderscoredBeatmapLink.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Overlays.Profile.Sections
@@ -15,15 +14,16 @@ namespace osu.Game.Overlays.Profile.Sections
             this.beatmap = beatmap;
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(BeatmapSetOverlay beatmapSetOverlay)
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             ClickAction = () =>
             {
-                if (beatmap.OnlineBeatmapID != null)
-                    beatmapSetOverlay?.FetchAndShowBeatmap(beatmap.OnlineBeatmapID.Value);
-                else if (beatmap.BeatmapSet?.OnlineBeatmapSetID != null)
-                    beatmapSetOverlay?.FetchAndShowBeatmapSet(beatmap.BeatmapSet.OnlineBeatmapSetID.Value);
+                var beatmapId = beatmap.OnlineBeatmapID;
+
+                if (beatmapId.HasValue)
+                    Game?.ShowBeatmap(beatmapId.Value);
             };
         }
     }
diff --git a/osu.Game/Overlays/Profile/Sections/UnderscoredLinkContainer.cs b/osu.Game/Overlays/Profile/Sections/UnderscoredLinkContainer.cs
index 8daf0bd24d..09a23d2fe3 100644
--- a/osu.Game/Overlays/Profile/Sections/UnderscoredLinkContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/UnderscoredLinkContainer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -17,6 +18,8 @@ namespace osu.Game.Overlays.Profile.Sections
         private readonly Container underscore;
         private readonly FillFlowContainer<OsuSpriteText> textContent;
 
+        protected OsuGame Game;
+
         protected Action ClickAction;
 
         public IReadOnlyList<OsuSpriteText> Text
@@ -59,6 +62,12 @@ namespace osu.Game.Overlays.Profile.Sections
             };
         }
 
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuGame game)
+        {
+            Game = game;
+        }
+
         protected override bool OnHover(HoverEvent e)
         {
             underscore.FadeIn(duration, Easing.OutQuint);
diff --git a/osu.Game/Overlays/Profile/Sections/UnderscoredUserLink.cs b/osu.Game/Overlays/Profile/Sections/UnderscoredUserLink.cs
index f50bc7f7ba..9b3e8ccdf6 100644
--- a/osu.Game/Overlays/Profile/Sections/UnderscoredUserLink.cs
+++ b/osu.Game/Overlays/Profile/Sections/UnderscoredUserLink.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
-
 namespace osu.Game.Overlays.Profile.Sections
 {
     public class UnderscoredUserLink : UnderscoredLinkContainer
@@ -14,10 +12,11 @@ namespace osu.Game.Overlays.Profile.Sections
             this.userId = userId;
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(UserProfileOverlay userProfileOverlay)
+        protected override void LoadComplete()
         {
-            ClickAction = () => userProfileOverlay?.ShowUser(userId);
+            base.LoadComplete();
+
+            ClickAction = () => Game?.ShowUser(userId);
         }
     }
 }