diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
index 9493dc2ef1..587ff4b573 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
@@ -79,8 +79,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
+            if (!disjointTrail)
+                return base.OnMouseMove(e);
+
             currentPosition = e.ScreenSpaceMousePosition;
-            return base.OnMouseMove(e);
+
+            // Intentionally block the base call as we're adding the trails ourselves.
+            return false;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index b05bf5c93e..7a95111c91 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -146,33 +146,25 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            Vector2 position = e.ScreenSpaceMousePosition;
-
-            if (lastPosition == null)
-            {
-                lastPosition = position;
-                resampler.AddPosition(lastPosition.Value);
-                return base.OnMouseMove(e);
-            }
-
-            if (InterpolateMovements)
-                AddTrail(position);
-
+            AddTrail(e.ScreenSpaceMousePosition);
             return base.OnMouseMove(e);
         }
 
         protected void AddTrail(Vector2 position)
         {
-            if (!lastPosition.HasValue)
-                return;
-
             if (InterpolateMovements)
             {
+                if (!lastPosition.HasValue)
+                {
+                    lastPosition = position;
+                    resampler.AddPosition(lastPosition.Value);
+                    return;
+                }
+
                 foreach (Vector2 pos2 in resampler.AddPosition(position))
                 {
                     Trace.Assert(lastPosition.HasValue);
 
-                    // ReSharper disable once PossibleInvalidOperationException
                     Vector2 pos1 = lastPosition.Value;
                     Vector2 diff = pos2 - pos1;
                     float distance = diff.Length;