diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index b782df75df..64ddba669d 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -53,14 +53,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
             var databasedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
 
-            if (databasedBeatmap == null)
-                hasBeatmap = false;
-            else
-            {
-                // DeletePending isn't updated in the beatmap info query above, need to directly query the beatmap set from database as well.
-                var databasedSet = beatmaps.QueryBeatmapSet(s => s.Equals(databasedBeatmap.BeatmapSet));
-                hasBeatmap = databasedSet?.DeletePending == false;
-            }
+            hasBeatmap = databasedBeatmap?.BeatmapSet?.DeletePending == false;
         }
 
         protected override void Update()