diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index badb6693c9..738902846b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -172,9 +172,8 @@ protected override void UpdateState(ArmedState state)
             const float preempt = 100;
             const float out_transition_time = 300;
 
-            var offset = !AllJudged ? 0 : Time.Current - HitObject.EndTime;
             double untilStartTime = HitObject.StartTime - Time.Current;
-            double untilJudgement = untilStartTime + offset + HitObject.Duration;
+            double untilJudgement = untilStartTime + (Judgements.FirstOrDefault()?.TimeOffset ?? 0) + HitObject.Duration;
 
             targetRing.Delay(untilStartTime - preempt).ScaleTo(target_ring_scale, preempt * 4, Easing.OutQuint);
             this.Delay(untilJudgement).FadeOut(out_transition_time, Easing.Out);