diff --git a/lms/envs/common.py b/lms/envs/common.py
index 25be538044..5642dd2f83 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2584,6 +2584,7 @@ INVOICE_PAYMENT_INSTRUCTIONS = "This is where you can\nput directions on how peo
 COUNTRIES_OVERRIDE = {
     # Taiwan is specifically not translated to avoid it being translated as "Taiwan (Province of China)"
     "TW": "Taiwan",
+    'XK': _('Kosovo'),
 }
 
 # which access.py permission name to check in order to determine if a course is visible in
diff --git a/openedx/core/djangoapps/user_api/tests/test_constants.py b/openedx/core/djangoapps/user_api/tests/test_constants.py
index 885cc79130..3b6b47af2d 100644
--- a/openedx/core/djangoapps/user_api/tests/test_constants.py
+++ b/openedx/core/djangoapps/user_api/tests/test_constants.py
@@ -118,6 +118,7 @@ SORTED_COUNTRIES = [
     (u"KZ", u"Kazakhstan"),
     (u"KE", u"Kenya"),
     (u"KI", u"Kiribati"),
+    (u"XK", u"Kosovo"),
     (u"KW", u"Kuwait"),
     (u"KG", u"Kyrgyzstan"),
     (u"LA", u"Laos"),
diff --git a/openedx/core/djangoapps/user_api/tests/test_views.py b/openedx/core/djangoapps/user_api/tests/test_views.py
index c39e277aa1..b67a701d25 100644
--- a/openedx/core/djangoapps/user_api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/tests/test_views.py
@@ -1713,6 +1713,15 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase):
                 )
             )
 
+    def test_country_overrides(self):
+        """Test that overridden countries are available in country list."""
+        # Retrieve the registration form description
+        with override_settings(REGISTRATION_EXTRA_FIELDS={"country": "required"}):
+            response = self.client.get(self.url)
+            self.assertHttpOK(response)
+
+        self.assertContains(response, 'Kosovo')
+
 
 @httpretty.activate
 @ddt.ddt