diff --git a/action.yml b/action.yml
index 25f05ee..9ecc894 100644
--- a/action.yml
+++ b/action.yml
@@ -10,9 +10,9 @@ inputs:
     required: false
     default: ${{ github.token }}
   commit-with-token:
-    description: 'Set to true to produce a verified commit with token'
+    description: 'Set to "true" to produce a verified commit with token'
     required: false
-    default: false
+    default: ''
   commit-msg:
     description: 'The message provided with the commit'
     required: false
diff --git a/update-flake-lock.sh b/update-flake-lock.sh
index bf90d73..512d875 100755
--- a/update-flake-lock.sh
+++ b/update-flake-lock.sh
@@ -6,9 +6,9 @@ if [[ -n "$PATH_TO_FLAKE_DIR" ]]; then
 fi
 
 commitArg=""
-
-if [[ "$COMMIT_WITH_TOKEN" != true ]]; then
-  commitArg="--commit-lock-file "
+if [[ "$COMMIT_WITH_TOKEN" != "true" ]]; then
+  # Commit happening in next step
+  commitArg="suppress"
 fi
 
 if [[ -n "$TARGETS" ]]; then
@@ -16,7 +16,7 @@ if [[ -n "$TARGETS" ]]; then
     for input in $TARGETS; do
         inputs+=("--update-input" "$input")
     done
-    nix flake lock "${inputs[@]}" $commitArg --commit-lockfile-summary "$COMMIT_MSG"
+    nix flake lock "${inputs[@]}" ${commitArg:+"--commit-lock-file"} --commit-lockfile-summary "$COMMIT_MSG"
 else
-    nix flake update $commitArg --commit-lockfile-summary "$COMMIT_MSG"
+    nix flake update ${commitArg:+"--commit-lock-file"} --commit-lockfile-summary "$COMMIT_MSG"
 fi