diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 665b3ad455..52d8ea0480 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -3,10 +3,18 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -23,6 +31,9 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneExpandedPanelMiddleContent : OsuTestScene
     {
+        [Resolved]
+        private RulesetStore rulesetStore { get; set; }
+
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ExpandedPanelMiddleContent),
@@ -35,23 +46,36 @@ public class TestSceneExpandedPanelMiddleContent : OsuTestScene
             typeof(TotalScoreCounter)
         };
 
-        public TestSceneExpandedPanelMiddleContent()
+        [Test]
+        public void TestMapWithKnownMapper()
         {
-            Child = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500, 700),
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4Extensions.FromHex("#444"),
-                    },
-                    new ExpandedPanelMiddleContent(createTestScore())
-                }
-            };
+            var author = new User { Username = "mapper_name" };
+
+            AddStep("show example score", () => showPanel(createTestBeatmap(author), createTestScore()));
+
+            AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Text == "mapper_name"));
+        }
+
+        [Test]
+        public void TestMapWithUnknownMapper()
+        {
+            AddStep("show example score", () => showPanel(createTestBeatmap(null), createTestScore()));
+
+            AddAssert("mapped by text not present", () =>
+                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text, "mapped", "by")));
+        }
+
+        private void showPanel(WorkingBeatmap workingBeatmap, ScoreInfo score)
+        {
+            Child = new ExpandedPanelMiddleContentContainer(workingBeatmap, score);
+        }
+
+        private WorkingBeatmap createTestBeatmap(User author)
+        {
+            var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0));
+            beatmap.Metadata.Author = author;
+
+            return new TestWorkingBeatmap(beatmap);
         }
 
         private ScoreInfo createTestScore() => new ScoreInfo
@@ -76,5 +100,31 @@ public TestSceneExpandedPanelMiddleContent()
                 { HitResult.Great, 300 },
             }
         };
+
+        private bool containsAny(string text, params string[] stringsToMatch) => stringsToMatch.Any(text.Contains);
+
+        private class ExpandedPanelMiddleContentContainer : Container
+        {
+            [Cached]
+            private Bindable<WorkingBeatmap> workingBeatmap { get; set; }
+
+            public ExpandedPanelMiddleContentContainer(WorkingBeatmap beatmap, ScoreInfo score)
+            {
+                workingBeatmap = new Bindable<WorkingBeatmap>(beatmap);
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                Size = new Vector2(500, 700);
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#444"),
+                    },
+                    new ExpandedPanelMiddleContent(score)
+                };
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 6b7e4c9cb4..82a2bd87ec 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -51,6 +51,7 @@ private void load(Bindable<WorkingBeatmap> working)
         {
             var beatmap = working.Value.BeatmapInfo;
             var metadata = beatmap.Metadata;
+            var creator = metadata.Author?.Username;
 
             var topStatistics = new List<StatisticDisplay>
             {
@@ -162,8 +163,11 @@ private void load(Bindable<WorkingBeatmap> working)
                                         Direction = FillDirection.Horizontal,
                                     }.With(t =>
                                     {
-                                        t.AddText("mapped by ");
-                                        t.AddText(score.UserString, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                                        if (!string.IsNullOrEmpty(creator))
+                                        {
+                                            t.AddText("mapped by ");
+                                            t.AddText(creator, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                                        }
                                     })
                                 }
                             },