diff --git a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/CountriesTool.kt b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/CountriesTool.kt
index 9f47f36..a18a32f 100644
--- a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/CountriesTool.kt
+++ b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/CountriesTool.kt
@@ -15,7 +15,7 @@ class CountriesTool {
         country = request.getHeader("Accept-Language")?.let { header ->
             langHeaderParser.find(header)
         }?.let { match ->
-            match.groupValues.getOrNull(2)?.lowercase() ?: match.groupValues[1].lowercase()
+            match.groupValues.getOrNull(2)?.let { it.ifEmpty { null } }?.lowercase() ?: match.groupValues[1].lowercase()
         }?.let { iso ->
             countries[iso]?.let { name ->
                 Pair(iso, name)