diff --git a/osu.Game/Screens/Play/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
index db42998c45..452e170cc6 100644
--- a/osu.Game/Screens/Play/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Screens.Play
 
         private SkinnableSound pauseLoop;
 
+        public void FlushPendingSkinChanges() => pauseLoop.FlushPendingSkinChanges();
         protected override Action BackAction => () => InternalButtons.First().TriggerClick();
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bc453d2151..d4180068d3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -316,6 +316,11 @@ namespace osu.Game.Screens.Play
             // we may want to limit this in the future to disallow rulesets from outright replacing elements the user expects to be there.
             failAnimationLayer.Add(createOverlayComponents(Beatmap.Value));
 
+            rulesetSkinProvider.SourceChanged += () =>
+            {
+                PauseOverlay.FlushPendingSkinChanges();
+            };
+
             if (!DrawableRuleset.AllowGameplayOverlays)
             {
                 HUDOverlay.ShowHud.Value = false;
diff --git a/osu.Game/Skinning/SkinReloadableDrawable.cs b/osu.Game/Skinning/SkinReloadableDrawable.cs
index 757ca8de83..ff51eb6dce 100644
--- a/osu.Game/Skinning/SkinReloadableDrawable.cs
+++ b/osu.Game/Skinning/SkinReloadableDrawable.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Skinning
             pendingSkinChange = Scheduler.Add(skinChanged);
         }
 
-        public void FlushPendingSkinChanges()
+        public virtual void FlushPendingSkinChanges()
         {
             if (pendingSkinChange == null)
                 return;
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 052b1e5b9f..f80b1f52fa 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -110,6 +110,13 @@ namespace osu.Game.Skinning
             }
         }
 
+        public override void FlushPendingSkinChanges()
+        {
+            base.FlushPendingSkinChanges();
+
+            samplesContainer.ForEach(c => c.FlushPendingSkinChanges());
+        }
+
         /// <summary>
         /// Plays the samples.
         /// </summary>
@@ -119,8 +126,6 @@ namespace osu.Game.Skinning
 
             samplesContainer.ForEach(c =>
             {
-                c.FlushPendingSkinChanges();
-
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
                 {
                     c.Stop();