diff --git a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
index de6daf9618..b4c7716e37 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
@@ -5,17 +5,23 @@ using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select;
+using osu.Game.Tests.Resources;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -27,7 +33,7 @@ namespace osu.Game.Tests.Visual.Menus
         private GameHost gameHost;
         private TestOsuGame osuGame;
 
-        private Vector2 backButtonPosition => osuGame.ToScreenSpace(new Vector2(0, osuGame.LayoutRectangle.Bottom));
+        private Vector2 backButtonPosition => osuGame.ToScreenSpace(new Vector2(25, osuGame.LayoutRectangle.Bottom - 25));
 
         [BackgroundDependencyLoader]
         private void load(GameHost gameHost)
@@ -55,7 +61,8 @@ namespace osu.Game.Tests.Visual.Menus
                 Add(osuGame);
             });
             AddUntilStep("Wait for load", () => osuGame.IsLoaded);
-            AddUntilStep("Wait for main menu", () => osuGame.ScreenStack.CurrentScreen is MainMenu);
+            AddUntilStep("Wait for intro", () => osuGame.ScreenStack.CurrentScreen is IntroScreen);
+            AddUntilStep("Wait for main menu", () => osuGame.ScreenStack.CurrentScreen is MainMenu menu && menu.IsLoaded);
         }
 
         [Test]
@@ -79,7 +86,7 @@ namespace osu.Game.Tests.Visual.Menus
             pushAndConfirm(() => songSelect = new TestSongSelect(), "song select");
             AddStep("Show mods overlay", () => songSelect.ModSelectOverlay.Show());
             AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
-            AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(osuGame.BackButton));
+            AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(backButtonPosition));
 
             // BackButton handles hover using its child button, so this checks whether or not any of BackButton's children are hovered.
             AddUntilStep("Back button is hovered", () => InputManager.HoveredDrawables.Any(d => d.Parent == osuGame.BackButton));
@@ -92,22 +99,28 @@ namespace osu.Game.Tests.Visual.Menus
         [Test]
         public void TestExitMultiWithEscape()
         {
-            pushAndConfirm(() => new Screens.Multi.Multiplayer(), "multiplayer");
+            pushAndConfirm(() => new TestMultiplayer(), "multiplayer");
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            pushAndConfirm(() => new Screens.Multi.Multiplayer(), "multiplayer");
+            pushAndConfirm(() => new TestMultiplayer(), "multiplayer");
             exitViaBackButtonAndConfirm();
         }
 
         private void pushAndConfirm(Func<Screen> newScreen, string screenName)
         {
             Screen screen = null;
-            AddStep($"Push new {screenName}", () => osuGame.ScreenStack.Push(screen = newScreen()));
-            AddUntilStep($"Wait for new {screenName}", () => osuGame.ScreenStack.CurrentScreen == screen);
+            AddStep($"Push new {screenName}", () =>
+            {
+                if (screenName == "song select")
+                    Logger.Log("fuck");
+                
+                osuGame.ScreenStack.Push(screen = newScreen());
+            });
+            AddUntilStep($"Wait for new {screenName}", () => osuGame.ScreenStack.CurrentScreen == screen && screen.IsLoaded);
         }
 
         private void exitViaEscapeAndConfirm()
@@ -118,7 +131,7 @@ namespace osu.Game.Tests.Visual.Menus
 
         private void exitViaBackButtonAndConfirm()
         {
-            AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(osuGame.BackButton));
+            AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(backButtonPosition));
             AddStep("Click back button", () => InputManager.Click(MouseButton.Left));
             AddUntilStep("Wait for main menu", () => osuGame.ScreenStack.CurrentScreen is MainMenu);
         }
@@ -143,6 +156,11 @@ namespace osu.Game.Tests.Visual.Menus
             public ModSelectOverlay ModSelectOverlay => ModSelect;
         }
 
+        private class TestMultiplayer : Screens.Multi.Multiplayer
+        {
+            protected override bool RequireOnline => false;
+        }
+
         private class TestLoader : Loader
         {
             protected override ShaderPrecompiler CreateShaderPrecompiler() => new TestShaderPrecompiler();
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 38b9526364..9fa1eb8aa7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -317,7 +317,7 @@ namespace osu.Game
 
         private void currentTrackCompleted()
         {
-            if (!Beatmap.Value.Track.Looping && !Beatmap.Disabled)
+            if (!Beatmap.Value.Track.Looping && !Beatmap.Disabled && musicController.IsLoaded)
                 musicController.NextTrack();
         }
 
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index e9eab12557..1a3e1213b4 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -316,7 +316,7 @@ namespace osu.Game.Screens.Menu
                             logoDelayedAction = Scheduler.AddDelayed(() =>
                             {
                                 if (impact)
-                                    logo?.Impact();
+                                    logo.Impact();
 
                                 game?.Toolbar.Show();
                             }, 200);
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 90806bab6e..3d9997e236 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Screens.Multi
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        protected virtual bool RequireOnline => true;
+
         private readonly MultiplayerWaveContainer waves;
 
         private readonly OsuButton createButton;
@@ -166,7 +168,7 @@ namespace osu.Game.Screens.Multi
 
         public void APIStateChanged(IAPIProvider api, APIState state)
         {
-            if (state != APIState.Online)
+            if (RequireOnline && state != APIState.Online)
                 forcefullyExit();
         }