diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index b7060ca3a..03ba1192b 100644
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -184,6 +184,9 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
 
     public void setSuggestions(List<CharSequence> suggestions, boolean completions,
             boolean typedWordValid, boolean haveMinimalSuggestion) {
+        // Don't update suggestions when there is zero or only one suggestion found.
+        if (suggestions != null && suggestions.size() <= 1)
+            return;
         if (mShowingAutoCorrectionInverted) {
             mHandler.postUpdateSuggestions(suggestions, completions, typedWordValid,
                     haveMinimalSuggestion);