diff --git a/src/syntax.c b/src/syntax.c
index 099e0a7..cb87a02 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -474,6 +474,10 @@
     int		dist;
     static int	changedtick = 0;	/* remember the last change ID */
 
+#ifdef FEAT_CONCEAL
+    current_sub_char = NUL;
+#endif
+
     /*
      * After switching buffers, invalidate current_state.
      * Also do this when a change was made, the current state may be invalid
@@ -1787,6 +1791,9 @@
 	current_id = 0;
 	current_trans_id = 0;
 #endif
+#ifdef FEAT_CONCEAL
+	current_flags = 0;
+#endif
 	return 0;
     }