diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
index 2bf5118039..55ea131dab 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             base.Update();
 
             var circle = position == SliderPosition.Start ? (HitCircle)Slider.HeadCircle :
-                Slider.RepeatCount % 2 == 0 ? Slider.TailCircle : Slider.LastRepeat;
+                Slider.RepeatCount % 2 == 0 ? Slider.TailCircle : Slider.LastRepeat!;
 
             CirclePiece.UpdateFrom(circle);
             marker.UpdateFrom(circle);
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 041907d790..57f277e1ce 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using System.Linq;
 using System.Threading;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
@@ -163,6 +164,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public SliderTailCircle TailCircle { get; protected set; }
 
         [JsonIgnore]
+        [CanBeNull]
         public SliderRepeat LastRepeat { get; protected set; }
 
         public Slider()