diff --git a/src/pretix/helpers/countries.py b/src/pretix/helpers/countries.py
index 830501338..d52ac8f70 100644
--- a/src/pretix/helpers/countries.py
+++ b/src/pretix/helpers/countries.py
@@ -148,4 +148,7 @@ def pycountry_add(db, **kw):
             continue
         value = value.lower()
         index = db.indices.setdefault(key, {})
-        index.setdefault(value, set()).add(obj)
+        if key in ["country_code"]:
+            index.setdefault(value, set()).add(obj)
+        else:
+            index[value] = obj