diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py
index 2533185c..bcdfd521 100644
--- a/scripts/geodata/addresses/components.py
+++ b/scripts/geodata/addresses/components.py
@@ -284,7 +284,11 @@ class AddressComponents(object):
                     else:
                         language = UNKNOWN_LANGUAGE
                 else:
-                    language = UNKNOWN_LANGUAGE
+                    default_languages = [lang for lang, default in candidate_languages if default]
+                    if len(default_languages) == 1:
+                        language = default_languages[0]
+                    else:
+                        language = UNKNOWN_LANGUAGE
 
         return language
 
diff --git a/scripts/geodata/language_id/disambiguation.py b/scripts/geodata/language_id/disambiguation.py
index 7f162a99..ae2918be 100644
--- a/scripts/geodata/language_id/disambiguation.py
+++ b/scripts/geodata/language_id/disambiguation.py
@@ -97,7 +97,7 @@ LATIN_TRANSLITERATED_SCRIPTS = {'Arabic', 'Cyrllic'}
 
 def has_non_latin_script(languages):
     for lang, is_default in languages:
-        scripts = script_languages.get(lang, set())
+        scripts = lang_scripts.get(lang, set())
         if LATIN_SCRIPT not in scripts or scripts & LATIN_TRANSLITERATED_SCRIPTS:
             return True
     return False