diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 6b421ed433..d896da5319 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -40,20 +40,12 @@ namespace osu.Game.Screens.Select.Leaderboards
                 scores = value;
                 getScoresRequest?.Cancel();
 
-                int i = 150;
+                scrollFlow?.FadeOut(200);
+                scrollFlow?.Expire();
+                scrollFlow = null;
+
                 if (scores == null)
-                {
-                    if (scrollFlow != null)
-                    {
-                        foreach (var c in scrollFlow.Children)
-                            c.FadeOut(i += 10);
-
-                        foreach (var c in scrollFlow.Children)
-                            c.LifetimeEnd = Time.Current + i;
-                    }
-
                     return;
-                }
 
                 // schedule because we may not be loaded yet (LoadComponentAsync complains).
                 Schedule(() =>
@@ -67,10 +59,9 @@ namespace osu.Game.Screens.Select.Leaderboards
                         ChildrenEnumerable = scores.Select((s, index) => new LeaderboardScore(s, index + 1) { Action = () => ScoreSelected?.Invoke(s) })
                     }, f =>
                     {
-                        scrollFlow?.Expire();
                         scrollContainer.Add(scrollFlow = f);
 
-                        i = 0;
+                        int i = 0;
                         foreach (var s in f.Children)
                         {
                             using (s.BeginDelayedSequence(i++ * 50, true))