diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index 7f4b1284a0..5476049882 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Online
         public void TestFlagScopeDependency()
         {
             AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
-            AddAssert("Check country is default", () => countryBindable.Value == default);
+            AddAssert("Check country is default", () => countryBindable.IsDefault);
             AddStep("Set country", () => countryBindable.Value = CountryCode.US);
             AddAssert("Check scope is Performance", () => scope.Value == RankingsScope.Performance);
         }
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index afeb58fde8..063b62bf08 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -21,6 +21,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Tournament.IO;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
+using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tournament
@@ -187,7 +188,7 @@ namespace osu.Game.Tournament
             var playersRequiringPopulation = ladder.Teams
                                                    .SelectMany(t => t.Players)
                                                    .Where(p => string.IsNullOrEmpty(p.Username)
-                                                               || p.CountryCode == default
+                                                               || p.CountryCode == CountryCode.Unknown
                                                                || p.Rank == null).ToList();
 
             if (playersRequiringPopulation.Count == 0)
diff --git a/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs b/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
index c55e7d65b6..c27a83b695 100644
--- a/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRankingsRequest.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.API.Requests
 
         private readonly CountryCode countryCode;
 
-        public GetUserRankingsRequest(RulesetInfo ruleset, UserRankingsType type = UserRankingsType.Performance, int page = 1, CountryCode countryCode = default)
+        public GetUserRankingsRequest(RulesetInfo ruleset, UserRankingsType type = UserRankingsType.Performance, int page = 1, CountryCode countryCode = CountryCode.Unknown)
             : base(ruleset, page)
         {
             Type = type;
@@ -26,7 +26,7 @@ namespace osu.Game.Online.API.Requests
         {
             var req = base.CreateWebRequest();
 
-            if (countryCode != default)
+            if (countryCode != CountryCode.Unknown)
                 req.AddParameter("country", countryCode.ToString());
 
             return req;
diff --git a/osu.Game/Overlays/Rankings/CountryFilter.cs b/osu.Game/Overlays/Rankings/CountryFilter.cs
index 3ad677e976..9376bafdff 100644
--- a/osu.Game/Overlays/Rankings/CountryFilter.cs
+++ b/osu.Game/Overlays/Rankings/CountryFilter.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Overlays.Rankings
 
         private void onCountryChanged(ValueChangedEvent<CountryCode> country)
         {
-            if (country.NewValue == default)
+            if (Current.Value == CountryCode.Unknown)
             {
                 countryPill.Collapse();
                 this.ResizeHeightTo(0, duration, Easing.OutQuint);
diff --git a/osu.Game/Overlays/Rankings/CountryPill.cs b/osu.Game/Overlays/Rankings/CountryPill.cs
index 610efbcc60..ee4c4f08af 100644
--- a/osu.Game/Overlays/Rankings/CountryPill.cs
+++ b/osu.Game/Overlays/Rankings/CountryPill.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Overlays.Rankings
 
         private void onCountryChanged(ValueChangedEvent<CountryCode> country)
         {
-            if (country.NewValue == default)
+            if (Current.Value == CountryCode.Unknown)
                 return;
 
             flag.CountryCode = country.NewValue;
diff --git a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
index d00a3680d8..a6f0c7a123 100644
--- a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Rankings.Tables
                 RelativeSizeAxes = Axes.Y;
                 TextAnchor = Anchor.CentreLeft;
 
-                if (countryCode != default)
+                if (countryCode != CountryCode.Unknown)
                     AddLink(countryCode.GetDescription(), () => rankings?.ShowCountry(countryCode));
             }
         }
diff --git a/osu.Game/Users/Drawables/DrawableFlag.cs b/osu.Game/Users/Drawables/DrawableFlag.cs
index f7718c4f63..253835b415 100644
--- a/osu.Game/Users/Drawables/DrawableFlag.cs
+++ b/osu.Game/Users/Drawables/DrawableFlag.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Users.Drawables
     {
         private readonly CountryCode countryCode;
 
-        public LocalisableString TooltipText => countryCode == default ? string.Empty : countryCode.GetDescription();
+        public LocalisableString TooltipText => countryCode == CountryCode.Unknown ? string.Empty : countryCode.GetDescription();
 
         public DrawableFlag(CountryCode countryCode)
         {
@@ -30,7 +30,7 @@ namespace osu.Game.Users.Drawables
             if (ts == null)
                 throw new ArgumentNullException(nameof(ts));
 
-            string textureName = countryCode == default ? "__" : countryCode.ToString();
+            string textureName = countryCode == CountryCode.Unknown ? "__" : countryCode.ToString();
             Texture = ts.Get($@"Flags/{textureName}") ?? ts.Get(@"Flags/__");
         }
     }
diff --git a/osu.Game/Users/Drawables/UpdateableFlag.cs b/osu.Game/Users/Drawables/UpdateableFlag.cs
index 808bfad565..9b101131b3 100644
--- a/osu.Game/Users/Drawables/UpdateableFlag.cs
+++ b/osu.Game/Users/Drawables/UpdateableFlag.cs
@@ -32,14 +32,14 @@ namespace osu.Game.Users.Drawables
         /// </summary>
         public Action Action;
 
-        public UpdateableFlag(CountryCode countryCode = default)
+        public UpdateableFlag(CountryCode countryCode = CountryCode.Unknown)
         {
             CountryCode = countryCode;
         }
 
         protected override Drawable CreateDrawable(CountryCode countryCode)
         {
-            if (countryCode == default && !ShowPlaceholderOnUnknown)
+            if (countryCode == CountryCode.Unknown && !ShowPlaceholderOnUnknown)
                 return null;
 
             return new Container