diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 8235d9d8..4b665694 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -611,6 +611,7 @@ yang2cli_var(clicon_handle h,
 					cb);
 		if (result < 0)
 		goto done;
+		if (result == 0)
 	    yang2cli_helptext(cb, helptext);
 	}
 	cprintf(cb, ")");
@@ -635,6 +636,7 @@ yang2cli_var(clicon_handle h,
 					cb);
 		if (result < 0)
 		goto done;
+		if (result == 0)
 	    yang2cli_helptext(cb, helptext);
 	    cprintf(cb, ")");
 	}