diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineGeneration.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineGeneration.cs
new file mode 100644
index 0000000000..095fddc33f
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineGeneration.cs
@@ -0,0 +1,87 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneBarLineGeneration : OsuTestScene
+    {
+        [Test]
+        public void TestCloseBarLineGeneration()
+        {
+            const double start_time = 1000;
+
+            var beatmap = new Beatmap<TaikoHitObject>
+            {
+                HitObjects =
+                {
+                    new Hit
+                    {
+                        Type = HitType.Centre,
+                        StartTime = start_time
+                    }
+                },
+                BeatmapInfo =
+                {
+                    Difficulty = new BeatmapDifficulty { SliderTickRate = 4 },
+                    Ruleset = new TaikoRuleset().RulesetInfo
+                },
+            };
+
+            beatmap.ControlPointInfo.Add(start_time, new TimingControlPoint());
+            beatmap.ControlPointInfo.Add(start_time + 1, new TimingControlPoint());
+
+            var barlines = new BarLineGenerator<BarLine>(beatmap).BarLines;
+
+            AddAssert("first barline generated", () => barlines.Any(b => b.StartTime == start_time));
+            AddAssert("second barline generated", () => barlines.Any(b => b.StartTime == start_time + 1));
+        }
+
+        [Test]
+        public void TestOmitBarLineEffectPoint()
+        {
+            const double start_time = 1000;
+            const double beat_length = 500;
+
+            const int time_signature_numerator = 4;
+
+            var beatmap = new Beatmap<TaikoHitObject>
+            {
+                HitObjects =
+                {
+                    new Hit
+                    {
+                        Type = HitType.Centre,
+                        StartTime = start_time
+                    }
+                },
+                BeatmapInfo =
+                {
+                    Difficulty = new BeatmapDifficulty { SliderTickRate = 4 },
+                    Ruleset = new TaikoRuleset().RulesetInfo
+                },
+            };
+
+            beatmap.ControlPointInfo.Add(start_time, new TimingControlPoint
+            {
+                BeatLength = beat_length,
+                TimeSignature = new TimeSignature(time_signature_numerator)
+            });
+
+            beatmap.ControlPointInfo.Add(start_time, new EffectControlPoint { OmitFirstBarLine = true });
+
+            var barlines = new BarLineGenerator<BarLine>(beatmap).BarLines;
+
+            AddAssert("first barline ommited", () => barlines.All(b => b.StartTime != start_time));
+            AddAssert("second barline generated", () => barlines.Any(b => b.StartTime == start_time + (beat_length * time_signature_numerator)));
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/BarLineGenerator.cs b/osu.Game/Rulesets/Objects/BarLineGenerator.cs
index dec81d9bbd..c2709db747 100644
--- a/osu.Game/Rulesets/Objects/BarLineGenerator.cs
+++ b/osu.Game/Rulesets/Objects/BarLineGenerator.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -40,14 +38,21 @@ namespace osu.Game.Rulesets.Objects
             for (int i = 0; i < timingPoints.Count; i++)
             {
                 TimingControlPoint currentTimingPoint = timingPoints[i];
+                EffectControlPoint currentEffectPoint = beatmap.ControlPointInfo.EffectPointAt(currentTimingPoint.Time);
                 int currentBeat = 0;
 
-                // Stop on the beat before the next timing point, or if there is no next timing point stop slightly past the last object
-                double endTime = i < timingPoints.Count - 1 ? timingPoints[i + 1].Time - currentTimingPoint.BeatLength : lastHitTime + currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator;
+                // Stop on the next timing point, or if there is no next timing point stop slightly past the last object
+                double endTime = i < timingPoints.Count - 1 ? timingPoints[i + 1].Time : lastHitTime + currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator;
 
+                double startTime = currentTimingPoint.Time;
                 double barLength = currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator;
 
-                for (double t = currentTimingPoint.Time; Precision.DefinitelyBigger(endTime, t); t += barLength, currentBeat++)
+                if (currentEffectPoint.OmitFirstBarLine)
+                {
+                    startTime += barLength;
+                }
+
+                for (double t = startTime; Precision.AlmostBigger(endTime, t); t += barLength, currentBeat++)
                 {
                     double roundedTime = Math.Round(t, MidpointRounding.AwayFromZero);