diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5e93d760e3..64fe0f6733 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -322,7 +322,7 @@ namespace osu.Game
         /// </param>
         public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
         {
-            difficultyCriteria ??= b => b.Ruleset.Equals(Ruleset.Value);
+            difficultyCriteria ??= _ => true;
 
             var databasedSet = beatmap.OnlineBeatmapSetID != null
                 ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID)
@@ -346,11 +346,15 @@ namespace osu.Game
                     return;
                 }
 
-                // Find first beatmap that matches our predicate.
-                var first = databasedSet.Beatmaps.Find(difficultyCriteria) ?? databasedSet.Beatmaps.First();
+                // Find beatmaps that match our predicate.
+                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria(b));
+                if (!beatmaps.Any())
+                    beatmaps = databasedSet.Beatmaps;
 
-                Ruleset.Value = first.Ruleset;
-                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
+
+                Ruleset.Value = selection.Ruleset;
+                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 4b79e9f24c..0c86017974 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -100,6 +100,9 @@ namespace osu.Game
 
         public bool IsDeployedBuild => AssemblyVersion.Major > 0;
 
+        [Cached]
+        protected readonly DifficultyRecommender DifficultyRecommender = new DifficultyRecommender();
+
         public virtual string Version
         {
             get
@@ -241,9 +244,7 @@ namespace osu.Game
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());
             Add(previewTrackManager);
 
-            DifficultyRecommender difficultyRecommender;
-            dependencies.Cache(difficultyRecommender = new DifficultyRecommender());
-            Add(difficultyRecommender);
+            Add(DifficultyRecommender);
 
             Ruleset.BindValueChanged(onRulesetChanged);
         }