diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index e7b50d25bb5..c2a8562eb97 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2144,7 +2144,9 @@ Use `eglot-managed-p' to determine if current buffer is managed.")
         (setf (eglot--managed-buffers server)
               (delq (current-buffer) (eglot--managed-buffers server)))
         (when (and eglot-autoshutdown
-                   (null (eglot--managed-buffers server)))
+                   (null (eglot--managed-buffers server))
+                   ;; Don't shutdown if up again soon.
+                   (not revert-buffer-in-progress-p))
           (eglot-shutdown server)))))))
 
 (defun eglot--managed-mode-off ()