diff --git a/core/java/com/android/internal/app/LocalePickerWithRegion.java b/core/java/com/android/internal/app/LocalePickerWithRegion.java
index fadeea41c8330..314b0a0c81dbf 100644
--- a/core/java/com/android/internal/app/LocalePickerWithRegion.java
+++ b/core/java/com/android/internal/app/LocalePickerWithRegion.java
@@ -176,8 +176,9 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
 
             // Add current system language into suggestion list
             for(LocaleStore.LocaleInfo localeInfo: LocaleStore.getSystemCurrentLocaleInfo()) {
-                if (appCurrentLocale == null ||
-                        !localeInfo.getLocale().equals(appCurrentLocale.getLocale())) {
+                boolean isNotCurrentLocale = appCurrentLocale == null
+                        || !localeInfo.getLocale().equals(appCurrentLocale.getLocale());
+                if (!isForCountryMode && isNotCurrentLocale) {
                     mLocaleList.add(localeInfo);
                 }
             }