diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index a8c50a37e7..9b7de2b7f4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -26,7 +26,7 @@ public TestSceneOnlineViewContainer()
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = onlineView = new OnlineViewContainer(@"Please login to view dummy test content")
+                Child = onlineView = new OnlineViewContainer(@"view dummy test content")
                 {
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index a7f81b4776..ac3a3edd67 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -23,6 +23,9 @@ public class OnlineViewContainer : Container, IOnlineComponent
 
         protected override Container<Drawable> Content => content;
 
+        [Resolved]
+        protected IAPIProvider API { get; private set; }
+
         public OnlineViewContainer(string placeholderMessage)
         {
             InternalChildren = new Drawable[]
@@ -35,12 +38,12 @@ public OnlineViewContainer(string placeholderMessage)
                 {
                     RelativeSizeAxes = Axes.Both,
                     Alpha = 0,
-                    Child = placeholder = new LoginPlaceholder(placeholderMessage)
+                    Child = placeholder = new LoginPlaceholder($@"Please sign in to {placeholderMessage}")
                 },
             };
         }
 
-        public void APIStateChanged(IAPIProvider api, APIState state)
+        public virtual void APIStateChanged(IAPIProvider api, APIState state)
         {
             switch (state)
             {
@@ -70,10 +73,16 @@ private void updatePlaceholderVisibility(bool showPlaceholder)
             }
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        protected override void LoadComplete()
         {
-            api.Register(this);
+            API?.Register(this);
+            base.LoadComplete();
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            API?.Unregister(this);
+            base.Dispose(isDisposing);
         }
     }
 }