2 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 2d6e2af89e..38682f3142 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -454,6 +454,9 @@ void set_init_1(void)
   /* Set all options to their Vim default */
   set_options_default(OPT_FREE);
 
+  // set 'laststatus'
+  last_status(false);
+
   /* Must be before option_expand(), because that one needs vim_isIDc() */
   didset_options();
 
@@ -3662,10 +3665,9 @@ set_num_option (
       p_wmw = p_wiw;
     }
     win_setminheight();
-  }
-  /* (re)set last window status line */
-  else if (pp == &p_ls) {
-    last_status(FALSE);
+  } else if (pp == &p_ls) {
+    /* (re)set last window status line */
+    last_status(false);
   }
   /* (re)set tab page line */
   else if (pp == &p_stal) {
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 6506c6a9b5..89d49028ae 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1360,10 +1360,10 @@ return {
     {
       full_name='laststatus', abbreviation='ls',
       type='number', scope={'global'},
-      vi_def=true,
+      vim=true,
       redraw={'all_windows'},
       varname='p_ls',
-      defaults={if_true={vi=1}}
+      defaults={if_true={vi=1,vim=2}}
     },
     {
       full_name='lazyredraw', abbreviation='lz',