1 files changed, 4 insertions, 3 deletions

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index b29d0bc6456..9dda53713f5 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1451,9 +1451,10 @@ special *Flymake log* buffer."  :group 'flymake :lighter
       (cancel-timer flymake-timer)
       (setq flymake-timer nil))
     (mapc #'flymake--delete-overlay (flymake--really-all-overlays))
-    (maphash (lambda (_backend state)
-               (flymake--clear-foreign-diags state))
-             flymake--state)))
+    (when flymake--state
+      (maphash (lambda (_backend state)
+                 (flymake--clear-foreign-diags state))
+               flymake--state))))
    ;; turning Flymake on or off has consequences for listings
    (flymake--update-diagnostics-listings (current-buffer)))