diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index a32093781..f88fe9e3d 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1564,7 +1564,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     public void setPunctuationSuggestions() {
         final SettingsValues currentSettings = mSettings.getCurrent();
         if (currentSettings.mBigramPredictionEnabled) {
-            clearSuggestionStrip();
+            setSuggestedWords(SuggestedWords.EMPTY);
+            setAutoCorrectionIndicator(false);
         } else {
             setSuggestedWords(currentSettings.mSpacingAndPunctuations.mSuggestPuncList);
         }