diff --git a/src/screen.c b/src/screen.c
index db26046..69df0b2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4055,6 +4055,12 @@
 			char_attr = syntax_attr;
 		    else
 			char_attr = hl_combine_attr(syntax_attr, char_attr);
+# ifdef FEAT_CONCEAL
+		    /* no concealing past the end of the line, it interferes
+		     * with line highlighting */
+		    if (c == NUL)
+			syntax_flags = 0;
+# endif
 		}
 #endif