diff --git a/osu.Game.Tests/Visual/TestCaseHistoricalSection.cs b/osu.Game.Tests/Visual/TestCaseHistoricalSection.cs
index e67f389969..d75f9116ce 100644
--- a/osu.Game.Tests/Visual/TestCaseHistoricalSection.cs
+++ b/osu.Game.Tests/Visual/TestCaseHistoricalSection.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual
     {
         public override string Description => "User's History";
 
-        public override IReadOnlyList<Type> RequiredTypes => new [] { typeof(HistoricalSection), typeof(MostPlayedBeatmapDrawable)};
+        public override IReadOnlyList<Type> RequiredTypes => new [] { typeof(HistoricalSection), typeof(PaginatedMostPlayedBeatmapContainer), typeof(MostPlayedBeatmapDrawable) };
 
 
         public TestCaseHistoricalSection()
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 022d64db03..f3a9694982 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -115,6 +115,7 @@ namespace osu.Game.Beatmaps
         // Metadata
         public string Version { get; set; }
 
+        [JsonProperty("difficulty_rating")]
         public double StarDifficulty { get; set; }
 
         public bool Equals(BeatmapInfo other)
diff --git a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
index cdc156be05..2d08f09d20 100644
--- a/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserMostPlayedBeatmapsRequest.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.Linq;
 using Newtonsoft.Json;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
@@ -28,7 +27,7 @@ namespace osu.Game.Online.API.Requests
         public int PlayCount;
 
         [JsonProperty]
-        private BeatmapResponse beatmap;
+        private BeatmapInfo beatmap;
 
         [JsonProperty]
         private GetBeatmapSetsResponse beatmapSet;
@@ -36,31 +35,10 @@ namespace osu.Game.Online.API.Requests
         public BeatmapInfo GetBeatmapInfo(RulesetStore rulesets)
         {
             BeatmapSetInfo setInfo = beatmapSet.ToBeatmapSet(rulesets);
-            return new BeatmapInfo
-            {
-                OnlineBeatmapID = beatmap.Id,
-                OnlineBeatmapSetID = setInfo.OnlineBeatmapSetID,
-                Ruleset = rulesets.AvailableRulesets.FirstOrDefault(ruleset => ruleset.Name.Equals(beatmap.Mode)),
-                StarDifficulty = beatmap.DifficultyRating,
-                Version = beatmap.Version,
-                Metadata = setInfo.Metadata,
-                BeatmapSet = setInfo,
-            };
-        }
-
-        private class BeatmapResponse
-        {
-            [JsonProperty]
-            public int Id;
-
-            [JsonProperty]
-            public string Mode;
-
-            [JsonProperty("difficulty_rating")]
-            public double DifficultyRating;
-
-            [JsonProperty]
-            public string Version;
+            beatmap.BeatmapSet = setInfo;
+            beatmap.OnlineBeatmapSetID = setInfo.OnlineBeatmapSetID;
+            beatmap.Metadata = setInfo.Metadata;
+            return beatmap;
         }
     }
 }