diff --git a/src/evalvars.c b/src/evalvars.c
index 08a9cc2e14..eb198fdf9f 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -756,10 +756,13 @@ ex_let_const(exarg_T *eap, int is_const)
 	if (l != NULL)
 	{
 	    rettv_list_set(&rettv, l);
-	    op[0] = '=';
-	    op[1] = NUL;
-	    (void)ex_let_vars(eap->arg, &rettv, FALSE, semicolon, var_count,
+	    if (!eap->skip)
+	    {
+		op[0] = '=';
+		op[1] = NUL;
+		(void)ex_let_vars(eap->arg, &rettv, FALSE, semicolon, var_count,
 								is_const, op);
+	    }
 	    clear_tv(&rettv);
 	}
     }
diff --git a/src/testdir/test_let.vim b/src/testdir/test_let.vim
index 3bb5748947..64d178c675 100644
--- a/src/testdir/test_let.vim
+++ b/src/testdir/test_let.vim
@@ -295,4 +295,12 @@ E
   app
   END
   call assert_equal(['something', 'app'], var1)
+
+  let check = []
+  if 0
+     let check =<< trim END
+       from heredoc
+     END
+  endif
+  call assert_equal([], check)
 endfunc
diff --git a/src/version.c b/src/version.c
index 3bcd910c13..4f0e6faa5c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2168,
 /**/
     2167,
 /**/