diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index 804287309..f2d971ca4 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -182,12 +182,13 @@ public class SubtypeSwitcher {
                     + newSubtype.getLocale() + "/" + newSubtype.getExtraValue() + ", from: "
                     + mCurrentSubtype.getLocale() + "/" + mCurrentSubtype.getExtraValue());
         }
-        if (newSubtype.equals(mCurrentSubtype)) return;
 
         final Locale newLocale = SubtypeLocale.getSubtypeLocale(newSubtype);
         mNeedsToDisplayLanguage.updateIsSystemLanguageSameAsInputLanguage(
                 mCurrentSystemLocale.equals(newLocale));
 
+        if (newSubtype.equals(mCurrentSubtype)) return;
+
         mCurrentSubtype = newSubtype;
         updateShortcutIME();
         mService.onRefreshKeyboard();