diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index 02b26acb7c..daee419b52 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -96,11 +96,11 @@ namespace osu.Game.Tests.Visual.Online
                         FavouriteCount = 456,
                         Submitted = DateTime.Now,
                         Ranked = DateTime.Now,
+                        BPM = 111,
                         HasVideo = true,
                         HasStoryboard = true,
                         Covers = new BeatmapSetOnlineCovers(),
                     },
-                    BPM = 111,
                     Metrics = new BeatmapSetMetrics { Ratings = Enumerable.Range(0, 11).ToArray() },
                     Beatmaps = new List<BeatmapInfo>
                     {
@@ -169,11 +169,11 @@ namespace osu.Game.Tests.Visual.Online
                         FavouriteCount = 456,
                         Submitted = DateTime.Now,
                         Ranked = DateTime.Now,
+                        BPM = 111,
                         HasVideo = true,
                         HasStoryboard = true,
                         Covers = new BeatmapSetOnlineCovers(),
                     },
-                    BPM = 111,
                     Metrics = new BeatmapSetMetrics { Ratings = Enumerable.Range(0, 11).ToArray() },
                     Beatmaps = new List<BeatmapInfo>
                     {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
index 5f80223541..53dbaeddda 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
@@ -47,11 +47,11 @@ namespace osu.Game.Tests.Visual.Online
                 Preview = @"https://b.ppy.sh/preview/12345.mp3",
                 PlayCount = 123,
                 FavouriteCount = 456,
+                BPM = 111,
                 HasVideo = true,
                 HasStoryboard = true,
                 Covers = new BeatmapSetOnlineCovers(),
             },
-            BPM = 111,
             Beatmaps = new List<BeatmapInfo>
             {
                 new BeatmapInfo
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 0b0f65f572..27a341ffb7 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -297,7 +297,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 },
                 Beatmaps = beatmaps,
                 DateAdded = DateTimeOffset.UtcNow,
-                BPM = bpm,
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    BPM = bpm,
+                }
             };
         }
     }
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 810db1589e..34a8ddf5c9 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -272,7 +272,10 @@ namespace osu.Game.Beatmaps
                 Beatmaps = new List<BeatmapInfo>(),
                 Metadata = beatmap.Metadata,
                 DateAdded = DateTimeOffset.UtcNow,
-                BPM = beatmap.ControlPointInfo.BPMMode,
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    BPM = beatmap.ControlPointInfo.BPMMode,
+                }
             };
         }
 
diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index 62366cab4e..a77dfa2148 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -35,11 +35,6 @@ namespace osu.Game.Beatmaps
         [NotMapped]
         public BeatmapSetMetrics Metrics { get; set; }
 
-        /// <summary>
-        /// The beats per minute of this beatmap set's song.
-        /// </summary>
-        public double BPM { get; set; }
-
         public double MaxStarDifficulty => Beatmaps?.Max(b => b.StarDifficulty) ?? 0;
 
         public double MaxLength => Beatmaps?.Max(b => b.Length) ?? 0;
diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
index 903d07bea0..ea3f0b61b9 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
@@ -51,6 +51,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public string Preview { get; set; }
 
+        /// <summary>
+        /// The beats per minute of this beatmap set's song.
+        /// </summary>
+        public double BPM { get; set; }
+
         /// <summary>
         /// The amount of plays this beatmap set has.
         /// </summary>
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index 50128bde7a..200a705500 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -77,13 +77,13 @@ namespace osu.Game.Online.API.Requests.Responses
                 Metadata = this,
                 Status = Status,
                 Metrics = ratings == null ? null : new BeatmapSetMetrics { Ratings = ratings },
-                BPM = bpm,
                 OnlineInfo = new BeatmapSetOnlineInfo
                 {
                     Covers = covers,
                     Preview = preview,
                     PlayCount = playCount,
                     FavouriteCount = favouriteCount,
+                    BPM = bpm,
                     Status = Status,
                     HasVideo = hasVideo,
                     HasStoryboard = hasStoryboard,
diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index f97212f180..2926c82631 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
         private void updateDisplay()
         {
-            bpm.Value = BeatmapSet?.BPM.ToString(@"0.##") ?? "-";
+            bpm.Value = BeatmapSet?.OnlineInfo?.BPM.ToString(@"0.##") ?? "-";
 
             if (beatmap == null)
             {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 6457f78746..7934cf388f 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Select.Carousel
                     return otherSet.BeatmapSet.DateAdded.CompareTo(BeatmapSet.DateAdded);
 
                 case SortMode.BPM:
-                    return BeatmapSet.BPM.CompareTo(otherSet.BeatmapSet.BPM);
+                    return BeatmapSet.OnlineInfo.BPM.CompareTo(otherSet.BeatmapSet.OnlineInfo.BPM);
 
                 case SortMode.Length:
                     return BeatmapSet.MaxLength.CompareTo(otherSet.BeatmapSet.MaxLength);