diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 43ddf8bea73..cae3fb76c98 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -344,8 +344,8 @@ flyspell-buffer checks the whole buffer."
   ;; improvement).
   (add-hook 'kill-buffer-hook
 	    '(lambda ()
-	       (if flyspell-mode
-		   (flyspell-mode-off))))
+	       (if (and flyspell-multi-language-p ispell-process)
+		   (ispell-kill-ispell t))))
   ;; we end with the flyspell hooks
   (run-hooks 'flyspell-mode-hook))