diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index da877fcd22..231fcbc174 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -285,8 +285,8 @@ namespace osu.Game.Screens.Play
 
             DimmableStoryboard.HasStoryboardEnded.ValueChanged += storyboardEnded =>
             {
-                if (storyboardEnded.NewValue && ScoreProcessor.HasCompleted.Value)
-                    scheduleCompletion();
+                if (storyboardEnded.NewValue && completionProgressDelegate == null)
+                    updateCompletionState(new ValueChangedEvent<bool>(true, ScoreProcessor.HasCompleted.Value));
             };
 
             // Bind the judgement processors to ourselves