diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 48a1f8bd7..cf1cb8f25 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1661,9 +1661,13 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                 builder.setTypedWordValid(typedWordValid).setHasMinimalSuggestion(
                         autoCorrectionAvailable);
             } else {
-                final SuggestedWords previousSuggestions = mSuggestionsView.getSuggestions();
-                if (previousSuggestions == mSettingsValues.mSuggestPuncList)
-                    return;
+                SuggestedWords previousSuggestions = mSuggestionsView.getSuggestions();
+                if (previousSuggestions == mSettingsValues.mSuggestPuncList) {
+                    if (builder.size() == 0) {
+                        return;
+                    }
+                    previousSuggestions = SuggestedWords.EMPTY;
+                }
                 builder.addTypedWordAndPreviousSuggestions(typedWord, previousSuggestions);
             }
         }