diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index 3c7919f1f5..bcbe060f82 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -62,15 +62,11 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public BeatmapInfo ToBeatmap(RulesetStore rulesets)
         {
-            var set = BeatmapSet?.ToBeatmapSet(rulesets) ?? new BeatmapSetInfo
-            {
-                OnlineBeatmapSetID = OnlineBeatmapSetID,
-                Status = BeatmapSet?.Status ?? BeatmapSetOnlineStatus.None
-            };
+            var set = BeatmapSet?.ToBeatmapSet(rulesets);
 
             return new BeatmapInfo
             {
-                Metadata = !string.IsNullOrEmpty(Artist) ? this : set.Metadata,
+                Metadata = set?.Metadata ?? this,
                 Ruleset = rulesets.GetRuleset(ruleset),
                 StarDifficulty = starDifficulty,
                 OnlineBeatmapID = OnlineBeatmapID,