diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index c1159dc000..522567584d 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -1,9 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Screens.Gameplay;
+using osu.Game.Tournament.Screens.Gameplay.Components;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
@@ -18,5 +22,24 @@ namespace osu.Game.Tournament.Tests.Screens
             Add(new GameplayScreen());
             Add(chat);
         }
+
+        [Test]
+        public void TestWarmup()
+        {
+            checkScoreVisibility(false);
+
+            toggleWarmup();
+            checkScoreVisibility(true);
+
+            toggleWarmup();
+            checkScoreVisibility(false);
+        }
+
+        private void checkScoreVisibility(bool visible)
+            => AddUntilStep($"scores {(visible ? "shown" : "hidden")}",
+                () => this.ChildrenOfType<TeamScore>().All(score => score.Alpha == (visible ? 1 : 0)));
+
+        private void toggleWarmup()
+            => AddStep("toggle warmup", () => this.ChildrenOfType<TourneyButton>().First().Click());
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index d790f4b754..8048425ce1 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -95,7 +95,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                     Origin = Anchor.TopRight,
                 },
             };
+        }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             updateDisplay();
         }
 
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 4ba86dcefc..33658115cc 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -14,9 +14,21 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private readonly TeamScore score;
 
+        private bool showScore;
+
         public bool ShowScore
         {
-            set => score.FadeTo(value ? 1 : 0, 200);
+            get => showScore;
+            set
+            {
+                if (showScore == value)
+                    return;
+
+                showScore = value;
+
+                if (IsLoaded)
+                    updateDisplay();
+            }
         }
 
         public TeamDisplay(TournamentTeam team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
@@ -92,5 +104,18 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            updateDisplay();
+            FinishTransforms(true);
+        }
+
+        private void updateDisplay()
+        {
+            score.FadeTo(ShowScore ? 1 : 0, 200);
+        }
     }
 }