diff --git a/cmd/completions.go b/cmd/completions.go
index abb32b3a87..6c987179b5 100644
--- a/cmd/completions.go
+++ b/cmd/completions.go
@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"os"
+
+	"github.com/spf13/cobra"
 )
 
 // CommandLineCompletionCommand allows to generate convenience scripts for using the piper cli in a shell.
@@ -44,7 +45,7 @@ $ piper completion fish > ~/.config/fish/completions/piper.fish
 `,
 		DisableFlagsInUseLine: true,
 		ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-		Args:                  cobra.ExactValidArgs(1),
+		Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
 		Run: func(cmd *cobra.Command, args []string) {
 			switch args[0] {
 			case "bash":