diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
index 31cc505a0d..086b1c2ac2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddToggleStep("toggle spawning", value => spewer.Active.Value = value);
             AddSliderStep("particle gravity", 0f, 1f, 0f, value => spewer.Gravity = value);
-            AddSliderStep("particle velocity", 0f, 1f, 0.25f, value => spewer.MaxVelocity = value);
+            AddSliderStep("particle velocity", 0f, 1f, 0.5f, value => spewer.MaxVelocity = value);
             AddStep("move to new location", () =>
             {
                 spewer.TransformTo(nameof(spewer.SpawnPosition), new Vector2(RNG.NextSingle(), RNG.NextSingle()), 1000, Easing.Out);
diff --git a/osu.Game/Graphics/ParticleSpewer.cs b/osu.Game/Graphics/ParticleSpewer.cs
index 6bf9bff05a..1ad4672238 100644
--- a/osu.Game/Graphics/ParticleSpewer.cs
+++ b/osu.Game/Graphics/ParticleSpewer.cs
@@ -82,6 +82,8 @@ namespace osu.Game.Graphics
 
             protected new ParticleSpewer Source => (ParticleSpewer)base.Source;
 
+            private readonly float maxLifetime;
+
             private float currentTime;
             private float gravity;
             private Axes relativePositionAxes;
@@ -91,6 +93,7 @@ namespace osu.Game.Graphics
                 : base(source)
             {
                 particles = new FallingParticle[Source.particles.Length];
+                maxLifetime = (float)Source.maxLifetime;
             }
 
             public override void ApplyState()
@@ -121,7 +124,7 @@ namespace osu.Game.Graphics
                     var alpha = p.AlphaAtTime(timeSinceStart);
                     if (alpha <= 0) continue;
 
-                    var pos = p.PositionAtTime(timeSinceStart, gravity);
+                    var pos = p.PositionAtTime(timeSinceStart, gravity, maxLifetime);
                     var scale = p.ScaleAtTime(timeSinceStart);
                     var angle = p.AngleAtTime(timeSinceStart);
 
@@ -187,12 +190,12 @@ namespace osu.Game.Graphics
 
             public float AngleAtTime(float timeSinceStart) => StartAngle + (EndAngle - StartAngle) * progressAtTime(timeSinceStart);
 
-            public Vector2 PositionAtTime(float timeSinceStart, float gravity)
+            public Vector2 PositionAtTime(float timeSinceStart, float gravity, float maxDuration)
             {
                 var progress = progressAtTime(timeSinceStart);
-                var currentGravity = new Vector2(0, gravity * Duration / 1000 * progress);
+                var currentGravity = new Vector2(0, gravity * Duration / maxDuration * progress);
 
-                return StartPosition + (Velocity + currentGravity) * timeSinceStart / 1000;
+                return StartPosition + (Velocity + currentGravity) * timeSinceStart / maxDuration;
             }
 
             private float progressAtTime(float timeSinceStart) => Math.Clamp(timeSinceStart / Duration, 0, 1);