diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 96b1f942d..8b466559c 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1469,6 +1469,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
                 ResearchLogger.latinIME_maybeDoubleSpacePeriod(textToInsert,
                         false /* isBatchMode */);
             }
+            mWordComposer.doubleSpacePeriod();
             mKeyboardSwitcher.updateShiftState();
             return true;
         }
diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java
index 2f81d15d5..5ecfc67b2 100644
--- a/java/src/com/android/inputmethod/latin/WordComposer.java
+++ b/java/src/com/android/inputmethod/latin/WordComposer.java
@@ -471,7 +471,12 @@ public final class WordComposer {
         mCapsCount = 0;
         mDigitsCount = 0;
         mIsBatchMode = false;
-        mPreviousWord = mTypedWord.toString();
+        final boolean isWhitespace = 1 == StringUtils.codePointCount(separatorString)
+                && Character.isWhitespace(separatorString.codePointAt(0));
+        // If not whitespace, we don't use the previous word for suggestion. This is consistent
+        // with how we get the previous word for suggestion: see RichInputConnection#spaceRegex and
+        // LatinIME#getNthPreviousWordForSuggestion.
+        mPreviousWord = isWhitespace ? mTypedWord.toString() : null;
         mTypedWord.setLength(0);
         mCodePointSize = 0;
         mTrailingSingleQuotesCount = 0;
@@ -485,6 +490,13 @@ public final class WordComposer {
         return lastComposedWord;
     }
 
+    public void doubleSpacePeriod() {
+        // When a period was entered with a double space, the separator we got has been
+        // changed by a period (see #commitWord). We should not use the previous word for
+        // suggestion.
+        mPreviousWord = null;
+    }
+
     public void resumeSuggestionOnLastComposedWord(final LastComposedWord lastComposedWord,
             final String previousWord) {
         mPrimaryKeyCodes = lastComposedWord.mPrimaryKeyCodes;