diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index d42ebc3384..25d28c1744 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Overlays.Profile
                                             Origin = Anchor.BottomLeft,
                                             Y = -48
                                         },
-                                        countryFlag = new DrawableFlag(user.Country?.FlagName ?? "__")
+                                        countryFlag = new DrawableFlag(user.Country?.FlagName)
                                         {
                                             Anchor = Anchor.BottomLeft,
                                             Origin = Anchor.BottomLeft,
diff --git a/osu.Game/Screens/Multiplayer/ParticipantInfo.cs b/osu.Game/Screens/Multiplayer/ParticipantInfo.cs
index 639f29567f..fa48287ce1 100644
--- a/osu.Game/Screens/Multiplayer/ParticipantInfo.cs
+++ b/osu.Game/Screens/Multiplayer/ParticipantInfo.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Multiplayer
             set
             {
                 host.Text = value.Username;
-                flagContainer.Children = new[] { new DrawableFlag(value.Country?.FlagName ?? @"__") { RelativeSizeAxes = Axes.Both } };
+                flagContainer.Children = new[] { new DrawableFlag(value.Country?.FlagName) { RelativeSizeAxes = Axes.Both } };
             }
         }
 
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index c2d2f82b5c..39c948f8d3 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -191,7 +191,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                                     Masking = true,
                                                     Children = new Drawable[]
                                                     {
-                                                        new DrawableFlag(Score.User?.Country?.FlagName ?? "__")
+                                                        new DrawableFlag(Score.User?.Country?.FlagName)
                                                         {
                                                             Width = 30,
                                                             RelativeSizeAxes = Axes.Y,
diff --git a/osu.Game/Users/Country.cs b/osu.Game/Users/Country.cs
index ac95d22329..bf06d9f8bc 100644
--- a/osu.Game/Users/Country.cs
+++ b/osu.Game/Users/Country.cs
@@ -49,9 +49,9 @@ namespace osu.Game.Users
             sprite.Texture = textures.Get($@"Flags/{flagName}");
         }
 
-        public DrawableFlag(string name = @"__")
+        public DrawableFlag(string name = null)
         {
-            flagName = name;
+            flagName = name ?? @"__";
 
             Children = new Drawable[]
             {
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index d51df8ccaa..cd9ca582fc 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Users
                                     Spacing = new Vector2(5f, 0f),
                                     Children = new Drawable[]
                                     {
-                                        new DrawableFlag(user.Country?.FlagName ?? @"__")
+                                        new DrawableFlag(user.Country?.FlagName)
                                         {
                                             Width = 30f,
                                             RelativeSizeAxes = Axes.Y,