diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index f6e1be693b..55b3707c38 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -161,6 +161,27 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             checkControlPointSelected(1, false);
         }
 
+        [Test]
+        public void TestZeroLengthSliderNotAllowed()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("drag control point 1 to control point 0", () =>
+            {
+                InputManager.PressButton(MouseButton.Left);
+                moveMouseToControlPoint(0);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+            moveMouseToControlPoint(2);
+            AddStep("drag control point 2 to control point 0", () =>
+            {
+                InputManager.PressButton(MouseButton.Left);
+                moveMouseToControlPoint(0);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+            checkPositions();
+
+        }
+
         private void moveHitObject()
         {
             AddStep("move hitobject", () =>
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 3d3dff653a..99edcd2149 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -226,7 +226,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updatePath()
         {
-            HitObject.Path.ExpectedDistance.Value = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
+            float expectedDistance = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
+            if (expectedDistance < 1)
+                return;
+            HitObject.Path.ExpectedDistance.Value = expectedDistance;
             editorBeatmap?.Update(HitObject);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index ae2a82fa10..1dc37510ad 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -387,7 +387,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         case IHasDuration endTimeHitObject:
                             var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
-                            if (endTimeHitObject.EndTime == snappedTime)
+                            if (endTimeHitObject.EndTime == snappedTime || (snappedTime - hitObject.StartTime) < 1)
                                 return;
 
                             endTimeHitObject.Duration = snappedTime - hitObject.StartTime;