diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 7a99abdac6..cbbef6e957 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -118,7 +118,10 @@ protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(I
             for (int i = 2; i < beatmap.HitObjects.Count; i++)
             {
                 // Check for negative durations
-                if (beatmap.HitObjects[i].StartTime > beatmap.HitObjects[i - 1].StartTime && beatmap.HitObjects[i - 1].StartTime > beatmap.HitObjects[i - 2].StartTime)
+                var currentAfterLast = beatmap.HitObjects[i].StartTime > beatmap.HitObjects[i - 1].StartTime;
+                var lastAfterSecondLast = beatmap.HitObjects[i - 1].StartTime > beatmap.HitObjects[i - 2].StartTime;
+
+                if (currentAfterLast && lastAfterSecondLast)
                 {
                     taikoDifficultyHitObjects.Add(
                         new TaikoDifficultyHitObject(