diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
index e86302bbd1..63fc4e47f9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
@@ -67,6 +67,11 @@ private void runForRuleset(RulesetInfo ruleset)
 
         private Player loadPlayerFor(RulesetInfo rulesetInfo)
         {
+            // if a player screen is present already, we must exit that before loading another one,
+            // otherwise it'll crash on SpectatorClient.BeginPlaying being called while client is in "playing" state already.
+            if (Stack.CurrentScreen is Player)
+                Stack.Exit();
+
             Ruleset.Value = rulesetInfo;
             var ruleset = rulesetInfo.CreateInstance();
 
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 0392e3ae52..ee184c1f35 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -12,6 +12,7 @@
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
@@ -79,6 +80,11 @@ protected void CreateTest([CanBeNull] Action action = null)
 
         protected void LoadPlayer(Mod[] mods)
         {
+            // if a player screen is present already, we must exit that before loading another one,
+            // otherwise it'll crash on SpectatorClient.BeginPlaying being called while client is in "playing" state already.
+            if (Stack.CurrentScreen is Player)
+                Stack.Exit();
+
             var ruleset = CreatePlayerRuleset();
             Ruleset.Value = ruleset.RulesetInfo;