diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b648c918e1..f2b3bfc090 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -81,6 +81,11 @@ namespace osu.Game.Screens.Play
 
         private bool isRestarting;
 
+        /// <summary>
+        /// Is set to true when pressed the via the quick retry hotkey.
+        /// </summary>
+        public Bindable<bool> IsQuickRestart = new Bindable<bool>();
+
         private Bindable<bool> mouseWheelDisabled;
 
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
@@ -287,7 +292,7 @@ namespace osu.Game.Screens.Play
                     {
                         if (!this.IsCurrentScreen()) return;
 
-                        Configuration.AutomaticallySkipIntro = true;
+                        IsQuickRestart.Value = true;
                         fadeOut(true);
                         Restart();
                     },
@@ -370,10 +375,7 @@ namespace osu.Game.Screens.Play
             skipIntroOverlay.IsSkippable.ValueChanged += e =>
             {
                 if (Configuration.AutomaticallySkipIntro && e.NewValue && RestartCount > 0)
-                {
-                    Configuration.AutomaticallySkipIntro = false;
                     performUserRequestedSkip();
-                }
             };
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 477811a979..76092fbaa3 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -386,9 +386,7 @@ namespace osu.Game.Screens.Play
         private void restartRequested()
         {
             if (CurrentPlayer != null)
-            {
-                isHotKeyRestart = CurrentPlayer.Configuration.AutomaticallySkipIntro;
-            }
+                isHotKeyRestart = CurrentPlayer.IsQuickRestart.Value;
 
             hideOverlays = true;
             ValidForResume = true;