diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 1f2982aed..97e898af9 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2053,12 +2053,16 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             // showSuggestions will retrieve the word near the cursor, we don't want that here)
             showSuggestions(suggestedWords, "");
         } else {
-            if (!isShowingPunctuationList()) setPunctuationSuggestions();
+            clearSuggestions();
         }
     }
 
     public void setPunctuationSuggestions() {
-        setSuggestions(mSettingsValues.mSuggestPuncList, false);
+        if (mSettingsValues.mBigramPredictionEnabled) {
+            clearSuggestions();
+        } else {
+            setSuggestions(mSettingsValues.mSuggestPuncList, false);
+        }
         setAutoCorrectionIndicator(false);
         setSuggestionStripShown(isSuggestionsStripVisible());
     }
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
index 40e54a474..e86390b11 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
@@ -670,7 +670,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
     }
 
     public void setSuggestions(SuggestedWords suggestedWords) {
-        if (suggestedWords == null || suggestedWords.size() == 0)
+        if (suggestedWords == null)
             return;
 
         clear();