1 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index 50f8990cf6..7e7e7cfdf7 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -2737,6 +2737,8 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
   }
 
   // Initialize jump list
+  setpcmark();
+  cleanup_jumplist(curwin, false);
   wms->jumps_size = shada_init_jumps(wms->jumps, &removable_bufs);
 
   // Initialize global marks
@@ -4086,11 +4088,13 @@ static bool shada_removable(const char *name)
 static inline size_t shada_init_jumps(
     PossiblyFreedShadaEntry *jumps, khash_t(bufset) *const removable_bufs)
 {
-  // Initialize jump list
+  if (!curwin->w_jumplistlen) {
+    return 0;
+  }
+
   size_t jumps_size = 0;
   const void *jump_iter = NULL;
-  setpcmark();
-  cleanup_jumplist(curwin, false);
+
   do {
     xfmark_T fm;
     jump_iter = mark_jumplist_iter(jump_iter, curwin, &fm);
@@ -4164,6 +4168,7 @@ void shada_encode_jumps(msgpack_sbuffer *const sbuf)
   khash_t(bufset) removable_bufs = KHASH_EMPTY_TABLE(bufset);
   find_removable_bufs(&removable_bufs);
   PossiblyFreedShadaEntry jumps[JUMPLISTSIZE];
+  cleanup_jumplist(curwin, true);
   size_t jumps_size = shada_init_jumps(jumps, &removable_bufs);
   msgpack_packer packer;
   msgpack_packer_init(&packer, sbuf, msgpack_sbuffer_write);