diff --git a/entrypoint.sh b/entrypoint.sh
index 9d02d9b..35043be 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -58,7 +58,7 @@ set_trace_on
 
 if [ -z "${INPUT_MODE}" ]; then
 	INPUT_MODE="${1}"
-	shift
+	shift || true # none set
 fi
 
 # to be able to set an extra env var
@@ -1532,6 +1532,7 @@ usage() {
 
 
 if [ -z "${INPUT_MODE}" ]; then
+	set +x
 	usage
 	exit 0
 fi