diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index 422ba748e3..60fd88882e 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -113,14 +113,21 @@ namespace osu.Game.Rulesets.Taiko.Replays
                 else
                     throw new InvalidOperationException("Unknown hit object type.");
 
-                Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
-
                 if (i < Beatmap.HitObjects.Count - 1)
                 {
-                    double waitTime = Beatmap.HitObjects[i + 1].StartTime - 1000;
+                    var nextHitObject = Beatmap.HitObjects[i + 1];
+
+                    if (!(nextHitObject.StartTime < endTime + KEY_UP_DELAY))
+                        Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
+
+                    double waitTime = nextHitObject.StartTime - 1000;
                     if (waitTime > endTime)
                         Frames.Add(new TaikoReplayFrame(waitTime));
                 }
+                else
+                {
+                    Frames.Add(new TaikoReplayFrame(endTime + KEY_UP_DELAY));
+                }
 
                 hitButton = !hitButton;
             }