diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 218a67e818..ec072a3dd2 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -1405,9 +1405,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                         yield return item;
 
-                        if (item is DrawableCarouselBeatmapSet set && set.Beatmaps?.IsLoaded == true)
+                        if (item is DrawableCarouselBeatmapSet set)
                         {
-                            foreach (var difficulty in set.Beatmaps)
+                            foreach (var difficulty in set.DrawableBeatmaps)
                                 yield return difficulty;
                         }
                     }
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index f7e0eae4a5..a6a6a2f585 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -899,12 +899,10 @@ namespace osu.Game.Screens.Select
                     Scroll.ChangeChildDepth(item, hasPassedSelection ? -item.Item.CarouselYPosition : item.Item.CarouselYPosition);
                 }
 
-                if (item is DrawableCarouselBeatmapSet set && set.Beatmaps?.IsLoaded == true)
+                if (item is DrawableCarouselBeatmapSet set)
                 {
-                    foreach (var diff in set.Beatmaps)
-                    {
-                        updateItem(diff, item);
-                    }
+                    for (int i = 0; i < set.DrawableBeatmaps.Count; i++)
+                        updateItem(set.DrawableBeatmaps[i], item);
                 }
             }
         }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 9a01b46216..eba40994e2 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -51,7 +51,9 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
-        public Container<DrawableCarouselItem>? Beatmaps;
+        public IReadOnlyList<DrawableCarouselItem> DrawableBeatmaps => beatmapContainer?.IsLoaded != true ? Array.Empty<DrawableCarouselItem>() : beatmapContainer;
+
+        private Container<DrawableCarouselItem>? beatmapContainer;
 
         private BeatmapSetInfo beatmapSet = null!;
 
@@ -124,7 +126,7 @@ namespace osu.Game.Screens.Select.Carousel
             Content.Clear();
             Header.Clear();
 
-            Beatmaps = null;
+            beatmapContainer = null;
             beatmapsLoadTask = null;
 
             if (Item == null)
@@ -162,7 +164,7 @@ namespace osu.Game.Screens.Select.Carousel
             // if we are already displaying all the correct beatmaps, only run animation updates.
             // note that the displayed beatmaps may change due to the applied filter.
             // a future optimisation could add/remove only changed difficulties rather than reinitialise.
-            if (Beatmaps != null && visibleBeatmaps.Length == Beatmaps.Count && visibleBeatmaps.All(b => Beatmaps.Any(c => c.Item == b)))
+            if (beatmapContainer != null && visibleBeatmaps.Length == beatmapContainer.Count && visibleBeatmaps.All(b => beatmapContainer.Any(c => c.Item == b)))
             {
                 updateBeatmapYPositions();
             }
@@ -171,17 +173,17 @@ namespace osu.Game.Screens.Select.Carousel
                 // on selection we show our child beatmaps.
                 // for now this is a simple drawable construction each selection.
                 // can be improved in the future.
-                Beatmaps = new Container<DrawableCarouselItem>
+                beatmapContainer = new Container<DrawableCarouselItem>
                 {
                     X = 100,
                     RelativeSizeAxes = Axes.Both,
                     ChildrenEnumerable = visibleBeatmaps.Select(c => c.CreateDrawableRepresentation()!)
                 };
 
-                beatmapsLoadTask = LoadComponentAsync(Beatmaps, loaded =>
+                beatmapsLoadTask = LoadComponentAsync(beatmapContainer, loaded =>
                 {
                     // make sure the pooled target hasn't changed.
-                    if (Beatmaps != loaded)
+                    if (beatmapContainer != loaded)
                         return;
 
                     Content.Child = loaded;
@@ -242,7 +244,7 @@ namespace osu.Game.Screens.Select.Carousel
 
         private void updateBeatmapYPositions()
         {
-            if (Beatmaps == null)
+            if (beatmapContainer == null)
                 return;
 
             if (beatmapsLoadTask == null || !beatmapsLoadTask.IsCompleted)
@@ -252,7 +254,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             bool isSelected = Item?.State.Value == CarouselItemState.Selected;
 
-            foreach (var panel in Beatmaps)
+            foreach (var panel in beatmapContainer)
             {
                 Debug.Assert(panel.Item != null);