diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs
index d72a347675..184938ceda 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs
@@ -61,27 +61,27 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestHitMarkers()
         {
             AddStep("enable hit markers", () => settings.ShowClickMarkers.Value = true);
-            AddAssert("hit markers visible", () => analysisContainer.HitMarkersVisible);
+            AddUntilStep("hit markers visible", () => analysisContainer.HitMarkersVisible);
             AddStep("disable hit markers", () => settings.ShowClickMarkers.Value = false);
-            AddAssert("hit markers not visible", () => !analysisContainer.HitMarkersVisible);
+            AddUntilStep("hit markers not visible", () => !analysisContainer.HitMarkersVisible);
         }
 
         [Test]
         public void TestAimMarker()
         {
             AddStep("enable aim markers", () => settings.ShowAimMarkers.Value = true);
-            AddAssert("aim markers visible", () => analysisContainer.AimMarkersVisible);
+            AddUntilStep("aim markers visible", () => analysisContainer.AimMarkersVisible);
             AddStep("disable aim markers", () => settings.ShowAimMarkers.Value = false);
-            AddAssert("aim markers not visible", () => !analysisContainer.AimMarkersVisible);
+            AddUntilStep("aim markers not visible", () => !analysisContainer.AimMarkersVisible);
         }
 
         [Test]
         public void TestAimLines()
         {
             AddStep("enable aim lines", () => settings.ShowCursorPath.Value = true);
-            AddAssert("aim lines visible", () => analysisContainer.AimLinesVisible);
+            AddUntilStep("aim lines visible", () => analysisContainer.AimLinesVisible);
             AddStep("disable aim lines", () => settings.ShowCursorPath.Value = false);
-            AddAssert("aim lines not visible", () => !analysisContainer.AimLinesVisible);
+            AddUntilStep("aim lines not visible", () => !analysisContainer.AimLinesVisible);
         }
 
         private Replay fabricateReplay()
diff --git a/osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs b/osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs
index 8a48e81111..2b7f6c9fc9 100644
--- a/osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs
@@ -65,13 +65,11 @@ namespace osu.Game.Rulesets.Osu.UI
             base.Update();
 
             if (requireDisplay)
-            {
                 initialise();
 
-                if (ClickMarkers != null) ClickMarkers.Alpha = showClickMarkers.Value ? 1 : 0;
-                if (FrameMarkers != null) FrameMarkers.Alpha = showFrameMarkers.Value ? 1 : 0;
-                if (CursorPath != null) CursorPath.Alpha = showCursorPath.Value ? 1 : 0;
-            }
+            if (ClickMarkers != null) ClickMarkers.Alpha = showClickMarkers.Value ? 1 : 0;
+            if (FrameMarkers != null) FrameMarkers.Alpha = showFrameMarkers.Value ? 1 : 0;
+            if (CursorPath != null) CursorPath.Alpha = showCursorPath.Value ? 1 : 0;
         }
 
         private void initialise()