diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
index 227b5e35bae..b3c56eacddc 100644
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -97,8 +97,7 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
 
     @Override
     public void onLocaleSelected(LocaleStore.LocaleInfo localeInfo) {
-        // TODO(b/223090003): check localeInfo.isSystemLocale()
-        if (localeInfo == null || localeInfo.getLocale() == null) {
+        if (localeInfo == null || localeInfo.getLocale() == null || localeInfo.isSystemLocale()) {
             setAppDefaultLocale("");
         } else {
             setAppDefaultLocale(localeInfo.getLocale().getLanguage());