diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
index 46e25fc688..3f207f6fa1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -115,8 +115,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private void checkForAutomaticDownload()
         {
-            downloadCheckCancellation?.Cancel();
-
             if (client.Room == null)
                 return;
 
@@ -143,6 +141,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             lastDownloadCheckedBeatmapId = item.BeatmapID;
 
+            downloadCheckCancellation?.Cancel();
+
             // In a perfect world we'd use BeatmapAvailability, but there's no event-driven flow for when a selection changes.
             // ie. if selection changes from "not downloaded" to another "not downloaded" we wouldn't get a value changed raised.
             beatmapLookupCache