diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index bbd415f68d1c0f57b87d527dda0b89ba51426b0b..38094a518d264a00667236fb799582dcf187c973 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -192,20 +192,11 @@ public class Suggest {
         } else {
             wordComposerForLookup = wordComposer;
         }
-        if (wordComposerForLookup.size() <= 1) {
-            // At first character typed, search only the bigrams
-            for (final String key : mDictionaries.keySet()) {
-                final Dictionary dictionary = mDictionaries.get(key);
-                suggestionsSet.addAll(dictionary.getSuggestions(
-                        wordComposerForLookup, prevWordForBigram, proximityInfo));
-            }
-        } else {
-            // At second character typed, search the unigrams (scores being affected by bigrams)
-            for (final String key : mDictionaries.keySet()) {
-                final Dictionary dictionary = mDictionaries.get(key);
-                suggestionsSet.addAll(dictionary.getSuggestions(
-                        wordComposerForLookup, prevWordForBigram, proximityInfo));
-            }
+
+        for (final String key : mDictionaries.keySet()) {
+            final Dictionary dictionary = mDictionaries.get(key);
+            suggestionsSet.addAll(dictionary.getSuggestions(
+                    wordComposerForLookup, prevWordForBigram, proximityInfo));
         }
 
         // TODO: Change this scheme - a boolean is not enough. A whitelisted word may be "valid"