diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 60fcbcd46..dad97456c 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1713,7 +1713,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
     }
 
     private CharSequence getTextWithUnderline(final CharSequence text) {
-        return mComposingStateManager.isAutoCorrectionIndicatorOn()
+        return mIsAutoCorrectionIndicatorOn
                 ? SuggestionSpanUtils.getTextWithAutoCorrectionIndicatorUnderline(this, text)
                 : text;
     }
@@ -1791,7 +1791,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
         if (ic != null) {
             final boolean oldAutoCorrectionIndicator =
                     mComposingStateManager.isAutoCorrectionIndicatorOn();
-            if (oldAutoCorrectionIndicator != newAutoCorrectionIndicator) {
+            if (mIsAutoCorrectionIndicatorOn != newAutoCorrectionIndicator) {
                 mComposingStateManager.setAutoCorrectionIndicatorOn(newAutoCorrectionIndicator);
                 if (DEBUG) {
                     Log.d(TAG, "Flip the indicator. " + oldAutoCorrectionIndicator