diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli
index 7a6133ac8..c2d1cbcaa 100644
--- a/Shorewall/lib.cli
+++ b/Shorewall/lib.cli
@@ -562,7 +562,7 @@ show_command() {
 		esac
 	    fi
 
-	    echo "$PRODUCT $version $([ $# -gt 1 ] && echo "Chains " || [ $# -gt 0 ] && echo "Chain " || echo $table Table)$* at ${HOSTNAME:-$(hostname)} - $(date)"
+	    echo "$PRODUCT $version $([ $# -gt 1 ] && echo "Chains " || [ $# -gt 0 ] && echo "Chain " || echo $table Table)$* at $HOSTNAME - $(date)"
 	    echo
 	    show_reset
 	    if [ $# -gt 0 ]; then