diff --git a/src/screen.c b/src/screen.c
index fd69cf0..ac24a16 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4726,7 +4726,7 @@
     }
 
     // first round: check for valid value, second round: assign values
-    for (round = 0; round <= 1; ++round)
+    for (round = 0; round <= (apply ? 1 : 0); ++round)
     {
 	if (round > 0)
 	{
@@ -4913,11 +4913,6 @@
 	    wp->w_fill_chars = fill_chars;
 	}
     }
-    else if (is_listchars)
-    {
-	vim_free(lcs_chars.multispace);
-	vim_free(lcs_chars.leadmultispace);
-    }
 
     return NULL;	// no error
 }