diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java
index 5fbbe4d407956..e392fd2937f99 100644
--- a/core/java/android/widget/SpellChecker.java
+++ b/core/java/android/widget/SpellChecker.java
@@ -82,6 +82,8 @@ public class SpellChecker implements SpellCheckerSessionListener {
     }
 
     private void setLocale(Locale locale) {
+        closeSession();
+
         final TextServicesManager textServicesManager = (TextServicesManager)
                 mTextView.getContext().getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
         mSpellCheckerSession = textServicesManager.newSpellCheckerSession(
@@ -99,12 +101,6 @@ public class SpellChecker implements SpellCheckerSessionListener {
         // Change SpellParsers' wordIterator locale
         mWordIterator = new WordIterator(locale);
 
-        // Stop all SpellParsers
-        final int length = mSpellParsers.length;
-        for (int i = 0; i < length; i++) {
-            mSpellParsers[i].finish();
-        }
-
         // Remove existing misspelled SuggestionSpans
         mTextView.removeMisspelledSpans((Editable) mTextView.getText());