diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index ef8758a22f..8ad1ca5143 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -38,7 +38,7 @@ namespace osu.Desktop.VisualTests.Tests
         {
             base.Reset();
 
-            if (beatmap?.Track == null)
+            //if (beatmap?.Track == null)
             {
                 var objects = new List<HitObject>();
 
@@ -60,7 +60,16 @@ namespace osu.Desktop.VisualTests.Tests
 
                 Beatmap b = new Beatmap
                 {
-                    HitObjects = objects
+                    HitObjects = objects,
+                    BeatmapInfo = new BeatmapInfo
+                    {
+                        Metadata = new BeatmapMetadata
+                        {
+                            Artist = @"Unknown",
+                            Title = @"Sample Beatmap",
+                            Author = @"peppy",
+                        }
+                    }
                 };
 
                 decoder.Process(b);
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 28c2c5f0e2..c6bc4eeeb8 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -113,6 +113,8 @@ namespace osu.Game.Beatmaps
         public WorkingBeatmap(Beatmap beatmap)
         {
             this.beatmap = beatmap;
+            BeatmapInfo = beatmap.BeatmapInfo;
+            BeatmapSetInfo = beatmap.BeatmapInfo.BeatmapSet;
         }
 
         public WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, BeatmapDatabase database, bool withStoryboard = false)