diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 1e0fbc90b4..86c0f3bd83 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -81,7 +81,7 @@ protected override void PopIn()
         {
             base.PopIn();
 
-            // We don't want to create new display on every call, only when exiting from fully closed state.
+            // We don't want to create a new display on every call, only when exiting from fully closed state.
             if (displayUpdateRequired)
             {
                 header.Current.TriggerChange();
@@ -102,7 +102,9 @@ private void loadDisplay(Drawable display)
 
             LoadComponentAsync(display, loaded =>
             {
-                loading.Hide();
+                if (API.IsLoggedIn)
+                    loading.Hide();
+
                 content.Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
@@ -110,9 +112,14 @@ private void loadDisplay(Drawable display)
         private void onTabChanged(ValueChangedEvent<DashboardOverlayTabs> tab)
         {
             cancellationToken?.Cancel();
-
             loading.Show();
 
+            if (!API.IsLoggedIn)
+            {
+                loadDisplay(Empty());
+                return;
+            }
+
             switch (tab.NewValue)
             {
                 case DashboardOverlayTabs.Friends:
@@ -126,19 +133,10 @@ private void onTabChanged(ValueChangedEvent<DashboardOverlayTabs> tab)
 
         public override void APIStateChanged(IAPIProvider api, APIState state)
         {
-            switch (state)
-            {
-                case APIState.Online:
-                    // Will force to create a display based on visibility state
-                    displayUpdateRequired = true;
-                    State.TriggerChange();
-                    return;
+            if (State.Value == Visibility.Hidden)
+                return;
 
-                default:
-                    content.Clear();
-                    loading.Show();
-                    return;
-            }
+            header.Current.TriggerChange();
         }
 
         protected override void Dispose(bool isDisposing)