diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index cecebfa0..a78a128b 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -439,7 +439,7 @@ main(int    argc,
     if (clicon_username_set(h, pw->pw_name) < 0)
 	goto done;
 
-    cligen_comment_set(cli_cligen(h), 0);   /* Siklu: disable comments */
+    cligen_comment_set(cli_cligen(h), '#'); /* Default to handle #! clicon_cli scripts */
     cligen_lexicalorder_set(cli_cligen(h), 1);
     
     /*