diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 3184b83202..ed0578d3a4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -86,15 +86,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateInitialState();
 
-            // sane defaults
-            ring.Show();
-            circle.Show();
-            number.Show();
-            glow.Show();
+            // Hide() cannot be used here, because when rewinding, we need these to be the final values
 
-            ApproachCircle.Hide();
-            ApproachCircle.ScaleTo(new Vector2(4));
-            explode.Hide();
+            ring.Alpha = 1;
+            circle.Alpha = 1;
+            number.Alpha = 1;
+            glow.Alpha = 1;
+
+            ApproachCircle.Alpha = 0;
+            ApproachCircle.Scale = new Vector2(4);
+            explode.Alpha = 0;
+            flash.Alpha = 0;
+
+            Scale = new Vector2(HitObject.Scale);
         }
 
         protected override void UpdatePreemptState()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 9205f43a6d..7429f084c3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected sealed override void UpdateState(ArmedState state)
         {
-            FinishTransforms();
+            ClearTransforms(true);
 
             using (BeginAbsoluteSequence(HitObject.StartTime - TIME_PREEMPT, true))
             {
@@ -38,7 +38,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected virtual void UpdateInitialState()
         {
-            Hide();
+            // Hide() cannot be used here, because when rewinding, we need these to be the final values
+            Alpha = 0;
         }
 
         protected virtual void UpdatePreemptState()