diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs
index d8ec0ad1f0..7d010592ae 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -34,9 +35,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestMultipleStatuses()
         {
+            FillFlowContainer rooms = null;
+
             AddStep("create rooms", () =>
             {
-                Child = new FillFlowContainer
+                Child = rooms = new FillFlowContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -124,6 +127,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     }
                 };
             });
+
+            AddUntilStep("wait for panel load", () => rooms.Count == 5);
+            AddUntilStep("correct status text", () => rooms.ChildrenOfType<OsuSpriteText>().Count(s => s.Text.ToString().StartsWith("Currently playing", StringComparison.Ordinal)) == 2);
+            AddUntilStep("correct status text", () => rooms.ChildrenOfType<OsuSpriteText>().Count(s => s.Text.ToString().StartsWith("Ready to play", StringComparison.Ordinal)) == 3);
         }
 
         [Test]
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index 5adce862a0..8e3aa77e7b 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -418,10 +418,16 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                                       var retrievedBeatmap = task.GetResultSafely();
 
                                       statusText.Text = "Currently playing ";
-                                      beatmapText.AddLink(retrievedBeatmap.GetDisplayTitleRomanisable(),
-                                          LinkAction.OpenBeatmap,
-                                          retrievedBeatmap.OnlineID.ToString(),
-                                          creationParameters: s => s.Truncate = true);
+
+                                      if (retrievedBeatmap != null)
+                                      {
+                                          beatmapText.AddLink(retrievedBeatmap.GetDisplayTitleRomanisable(),
+                                              LinkAction.OpenBeatmap,
+                                              retrievedBeatmap.OnlineID.ToString(),
+                                              creationParameters: s => s.Truncate = true);
+                                      }
+                                      else
+                                          beatmapText.AddText("unknown beatmap");
                                   }), cancellationSource.Token);
             }
         }