diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 339c68b55..5b7d6584e 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -400,8 +400,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         final Resources res = getResources();
         mResources = res;
 
-        // TODO: remove the following when it's not needed by updateCorrectionMode() any more
-        mInputAttributes = new InputAttributes(null, false /* isFullscreenMode */);
         loadSettings();
 
         ImfUtils.setAdditionalInputMethodSubtypes(this, mSettingsValues.getAdditionalSubtypes());
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index 0f522f20f..fb3c03963 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -188,7 +188,7 @@ public class SettingsValues {
 
     private int createCorrectionMode(final InputAttributes inputAttributes) {
         final boolean shouldAutoCorrect = mAutoCorrectEnabled
-                && !inputAttributes.mInputTypeNoAutoCorrect;
+                && (null == inputAttributes || !inputAttributes.mInputTypeNoAutoCorrect);
         if (mBigramSuggestionEnabled && shouldAutoCorrect) return Suggest.CORRECTION_FULL_BIGRAM;
         return shouldAutoCorrect ? Suggest.CORRECTION_FULL : Suggest.CORRECTION_NONE;
     }