1 files changed, 5 insertions, 0 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 50517d2829..bf6e316c06 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -486,6 +486,11 @@ void update_single_line(win_T *wp, linenr_T lnum)
   int row;
   int j;
 
+  // Don't do anything if the screen structures are (not yet) valid.
+  if (!screen_valid(true)) {
+    return;
+  }
+
   if (lnum >= wp->w_topline && lnum < wp->w_botline
       && foldedCount(wp, lnum, &win_foldinfo) == 0) {
     row = 0;