diff --git a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
index 66643c5743..a4d7056017 100644
--- a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
+++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
@@ -214,6 +214,9 @@ namespace osu.Game.Screens.Tournament
             if (availableTeams.Count == 0)
                 return;
 
+            if (scrollState == ScrollState.Stopped)
+                return;
+
             scrollState = ScrollState.Stopping;
         }
 
@@ -295,6 +298,7 @@ namespace osu.Game.Screens.Tournament
 
         enum ScrollState
         {
+            None,
             Idle,
             Stopping,
             Stopped,