diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
index e925859d71..31c4d66784 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFirstRunSetupOverlay.cs
@@ -66,6 +66,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
+        [Ignore("Enable when first run setup is being displayed on first run.")]
         public void TestDoesntOpenOnSecondRun()
         {
             AddStep("set first run", () => LocalConfig.SetValue(OsuSetting.ShowFirstRunSetup, true));
diff --git a/osu.Game/Overlays/FirstRunSetupOverlay.cs b/osu.Game/Overlays/FirstRunSetupOverlay.cs
index c4e3626996..dc1ae2be37 100644
--- a/osu.Game/Overlays/FirstRunSetupOverlay.cs
+++ b/osu.Game/Overlays/FirstRunSetupOverlay.cs
@@ -157,7 +157,8 @@ namespace osu.Game.Overlays
 
             config.BindWith(OsuSetting.ShowFirstRunSetup, showFirstRunSetup);
 
-            if (showFirstRunSetup.Value) Show();
+            // TODO: uncomment when happy with the whole flow.
+            // if (showFirstRunSetup.Value) Show();
         }
 
         public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
@@ -289,7 +290,8 @@ namespace osu.Game.Overlays
             }
             else
             {
-                showFirstRunSetup.Value = false;
+                // TODO: uncomment when happy with the whole flow.
+                // showFirstRunSetup.Value = false;
                 currentStepIndex = null;
                 Hide();
             }