diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 7e964ed5fa..57dbfbb507 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -190,7 +190,8 @@ namespace osu.Game.Online.Multiplayer
             return joinOrLeaveTaskChain.Add(async () =>
             {
                 await scheduledReset.ConfigureAwait(false);
-                await LeaveRoomInternal().ConfigureAwait(false);
+                if (Room != null)
+                    await LeaveRoomInternal().ConfigureAwait(false);
             });
         }
 
@@ -391,6 +392,12 @@ namespace osu.Game.Online.Multiplayer
 
         Task IMultiplayerClient.UserKicked(MultiplayerRoomUser user)
         {
+            if (LocalUser == null)
+                return Task.CompletedTask;
+
+            if (user.Equals(LocalUser))
+                LeaveRoom();
+
             // TODO: also inform users of the kick operation.
             return ((IMultiplayerClient)this).UserLeft(user);
         }