diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index c42f0564c..e99bb7016 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -431,8 +431,10 @@ public class Settings extends InputMethodSettingsActivity
         final boolean showBigramSuggestionsOption = res.getBoolean(
                 R.bool.config_enable_bigram_suggestions_option);
         if (!showBigramSuggestionsOption) {
-            textCorrectionGroup.removePreference(findPreference(PREF_BIGRAM_SUGGESTIONS));
-            textCorrectionGroup.removePreference(findPreference(PREF_BIGRAM_PREDICTIONS));
+            textCorrectionGroup.removePreference(mBigramSuggestion);
+            if (null != mBigramPrediction) {
+                textCorrectionGroup.removePreference(mBigramPrediction);
+            }
         }
 
         final boolean showUsabilityModeStudyOption = res.getBoolean(