diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index d62b53088a..70cd21b2db 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -352,10 +352,12 @@ namespace osu.Game.Online.API
         public void Logout()
         {
             flushQueue();
+
             password = null;
             authentication.Clear();
-            LocalUser.Value = createGuestUser();
             State = APIState.Offline;
+
+            Schedule(() => LocalUser.Value = createGuestUser());
         }
 
         private static User createGuestUser() => new GuestUser();