diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 2f60f504de..8bdf2bdc1a 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -83,15 +83,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         {
             Debug.Assert(room.RoomID.Value != null);
 
-            var joinTask = multiplayerClient.JoinRoom(room);
-            joinTask.ContinueWith(_ => Schedule(() => onSuccess?.Invoke(room)), TaskContinuationOptions.OnlyOnRanToCompletion);
-            joinTask.ContinueWith(t =>
+            multiplayerClient.JoinRoom(room).ContinueWith(t =>
             {
-                PartRoom();
-                if (t.Exception != null)
-                    Logger.Error(t.Exception, "Failed to join multiplayer room.");
-                Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
-            }, TaskContinuationOptions.NotOnRanToCompletion);
+                if (t.IsCompletedSuccessfully)
+                    Schedule(() => onSuccess?.Invoke(room));
+                else
+                {
+                    if (t.Exception != null)
+                        Logger.Error(t.Exception, "Failed to join multiplayer room.");
+
+                    PartRoom();
+                    Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
+                }
+            });
         }
 
         private void updatePolling()