diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 381c5ea712..4c4cc87f6d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -282,12 +282,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 int countReady = room.Users.Count(u => u.State == MultiplayerUserState.Ready);
                 int countTotal = room.Users.Count(u => u.State != MultiplayerUserState.Spectating);
-
-                string countdownText = room.Countdown == null ? string.Empty : $"Starting in {room.Countdown.EndTime - DateTimeOffset.Now:mm\\:ss}";
                 string countText = $"({countReady} / {countTotal} ready)";
 
                 if (room.Countdown != null)
                 {
+                    string countdownText = $"Starting in {room.Countdown.EndTime - DateTimeOffset.Now:mm\\:ss}";
+
                     switch (localUser?.State)
                     {
                         default:
@@ -329,37 +329,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 var localUser = multiplayerClient.LocalUser;
 
-                if (room.Countdown != null)
+                switch (localUser?.State)
                 {
-                    switch (localUser?.State)
-                    {
-                        default:
-                            setGreen();
-                            break;
+                    default:
+                        setGreen();
+                        break;
 
-                        case MultiplayerUserState.Spectating:
-                        case MultiplayerUserState.Ready:
+                    case MultiplayerUserState.Spectating:
+                    case MultiplayerUserState.Ready:
+                        if (room?.Host?.Equals(localUser) == true && room.Countdown == null)
+                            setGreen();
+                        else
                             setYellow();
-                            break;
-                    }
-                }
-                else
-                {
-                    switch (localUser?.State)
-                    {
-                        default:
-                            setGreen();
-                            break;
 
-                        case MultiplayerUserState.Spectating:
-                        case MultiplayerUserState.Ready:
-                            if (room?.Host?.Equals(localUser) == true)
-                                setGreen();
-                            else
-                                setYellow();
-
-                            break;
-                    }
+                        break;
                 }
 
                 void setYellow()
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 4066cd0c4a..309ca6ca58 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -322,13 +322,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                     async Task start()
                     {
-                        try
-                        {
-                            await lastCountdownTask;
-                        }
-                        catch (OperationCanceledException)
-                        {
-                        }
+                        await lastCountdownTask;
 
                         Schedule(() =>
                         {