diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index 9332aa679a..dec965e567 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -10,7 +10,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Osu
 {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index bada67816b..7359f6029e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -166,17 +166,21 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.LoadComplete();
 
+            Anchor = Anchor.TopLeft;
+            Origin = Anchor.TopLeft;
+
+            SmokeStartTime = Time.Current;
+
+            totalDistance = PointInterval;
+
             if (smokeContainer != null)
             {
                 smokeContainer.SmokeMoved += onSmokeMoved;
                 smokeContainer.SmokeEnded += onSmokeEnded;
                 IsActive = true;
+
+                onSmokeMoved(smokeContainer.LastMousePosition, Time.Current);
             }
-
-            Anchor = Anchor.TopLeft;
-            Origin = Anchor.TopLeft;
-
-            SmokeStartTime = Time.Current;
         }
 
         private Vector2 nextPointDirection()
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index 07a073c3e5..2b5bddf959 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Rulesets.Osu.UI
         public event Action<Vector2, double>? SmokeMoved;
         public event Action<double>? SmokeEnded;
 
+        public Vector2 LastMousePosition;
+
         private bool isSmoking;
 
         public override bool ReceivePositionalInputAt(Vector2 _) => true;
@@ -50,6 +52,8 @@ namespace osu.Game.Rulesets.Osu.UI
             if (isSmoking)
                 SmokeMoved?.Invoke(e.MousePosition, Time.Current);
 
+            LastMousePosition = e.MousePosition;
+
             return base.OnMouseMove(e);
         }
     }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 0a32513834..bd55ed8bd6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
             addSeekStep(3000);
             AddAssert("all judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.Judged));
-            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses >= 7));
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.Select(kc => kc.CountPresses).Sum() == 15);
             AddStep("clear results", () => Player.Results.Clear());
             addSeekStep(0);
             AddAssert("none judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => !h.Judged));