diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index 88fb9d861..7992979e3 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -3369,7 +3369,7 @@ shorewall_cli() {
     g_haveconfig=
     g_conditional=
     g_file=
-    g_doing=
+    g_doing="Compiling"
 
     VERBOSE=
     VERBOSITY=1
diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index a7e8c4c62..74b4accc2 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -373,7 +373,7 @@ compiler() {
     #
     get_config Yes
 
-    progress_message3 "$g_doing..."
+    [ -n "$g_doing" ] && progress_message3 "$g_doing..."
 
     case $COMMAND in
 	*start|try|refresh)
@@ -473,8 +473,6 @@ start_command() {
 	    rc=$?
 	    [ -n "$nolock" ] || mutex_off
 	else
-	    g_doing="Compiling"
-
 	    if compiler $g_debugging $nolock compile ${VARDIR}/.start; then
 		run_postcompile ${VARDIR}/.start
 		[ -n "$nolock" ] || mutex_on
@@ -689,7 +687,7 @@ compile_command() {
 	    ;;
     esac
 
-    [ "x$g_file" = x- ] || g_doing="Compiling"
+    [ "x$g_file" = x- ] && g_doing=''
 
     compiler $g_debugging compile $g_file && run_postcompile $g_file
 }
@@ -955,8 +953,6 @@ restart_command() {
     fi
 
     if [ -z "$g_fast" ]; then
-	g_doing="Compiling"
-
 	if compiler $g_debugging $nolock compile ${VARDIR}/.restart; then
 	    run_postcompile ${VARDIR}/.restart
 	    [ -n "$nolock" ] || mutex_on
@@ -1047,8 +1043,6 @@ refresh_command() {
 
     [ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
 
-    g_doing="Compiling"
-
     if compiler $g_debugging $nolock compile ${VARDIR}/.refresh; then
 	run_postcompile ${VARDIR}/.refresh
 	[ -n "$nolock" ] || mutex_on
@@ -1158,8 +1152,6 @@ safe_commands() {
 	command="restart"
     fi
 
-    g_doing="Compiling"
-
     if ! compiler $g_debugging nolock compile ${VARDIR}/.$command; then
 	status=$?
 	exit $status
@@ -1291,8 +1283,6 @@ try_command() {
 	command="restart"
     fi
 
-    g_doing="Compiling"
-
     if ! compiler $g_debugging $nolock compile ${VARDIR}/.$command; then
 	status=$?
 	exit $status