diff --git a/osu.Game/Screens/SelectV2/RealmPopulatingOnlineLookupSource.cs b/osu.Game/Screens/SelectV2/RealmPopulatingOnlineLookupSource.cs
index 2b75820587..821e791140 100644
--- a/osu.Game/Screens/SelectV2/RealmPopulatingOnlineLookupSource.cs
+++ b/osu.Game/Screens/SelectV2/RealmPopulatingOnlineLookupSource.cs
@@ -101,10 +101,9 @@ namespace osu.Game.Screens.SelectV2
                         if (dbBeatmap.MatchesOnlineVersion && dbBeatmap.Status != onlineBeatmap.Status)
                             dbBeatmap.Status = onlineBeatmap.Status;
 
-                        HashSet<string> userTags = onlineBeatmap.TopTags?
-                                                                .Select(t => (topTag: t, relatedTag: tagsById.GetValueOrDefault(t.TagId)))
-                                                                .Where(t => t.relatedTag != null)
-                                                                .Select(t => t.relatedTag!.Name)
+                        onlineBeatmap.BeatmapSet = onlineBeatmapSet;
+                        HashSet<string> userTags = onlineBeatmap.GetTopUserTags()?
+                                                                .Select(t => t.Tag.Name)
                                                                 .ToHashSet() ?? [];
 
                         if (!userTags.SetEquals(dbBeatmap.Metadata.UserTags))