1 files changed, 10 insertions, 0 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index fd8264583b..ed055e76ba 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -662,7 +662,17 @@ void getout(int exitval)
   }
 
   if (v_dying <= 1) {
+    int unblock = 0;
+
+    // deathtrap() blocks autocommands, but we do want to trigger VimLeave.
+    if (is_autocmd_blocked()) {
+      unblock_autocmds();
+      unblock++;
+    }
     apply_autocmds(EVENT_VIMLEAVE, NULL, NULL, false, curbuf);
+    if (unblock) {
+      block_autocmds();
+    }
   }
 
   profile_dump();