diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 8c9f08fa6d..2dbf7989d7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -221,8 +221,8 @@ namespace osu.Game
                     return;
                 }
 
-                var databasedSet =
-                    BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID) ??
+                var databasedSet = beatmap.OnlineBeatmapSetID != null ?
+                    BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID) :
                     BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmap.Hash);
 
                 if (databasedSet != null)