2 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 25ead0c201..d2d195155d 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -20909,7 +20909,6 @@ const void *var_shada_iter(const void *const iter, const char **const name,
       hi++;
     }
     if ((size_t) (hi - hifirst) == hinum) {
-      *rettv = (typval_T) { .v_type = VAR_UNKNOWN };
       return NULL;
     }
   } else {
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index 654b6dde41..76ae82e309 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -2483,9 +2483,9 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
     const Timestamp cur_timestamp = os_time();
     do {
       typval_T vartv;
-      const char *name;
+      const char *name = NULL;
       var_iter = var_shada_iter(var_iter, &name, &vartv);
-      if (var_iter == NULL && vartv.v_type == VAR_UNKNOWN) {
+      if (name == NULL) {
         break;
       }
       typval_T tgttv;