diff --git a/cli/cobra.go b/cli/cobra.go
index 962b314412..b01774f04a 100644
--- a/cli/cobra.go
+++ b/cli/cobra.go
@@ -30,7 +30,7 @@ func SetupRootCommand(rootCmd *cobra.Command) {
 // docker/docker/cli error messages
 func FlagErrorFunc(cmd *cobra.Command, err error) error {
 	if err == nil {
-		return err
+		return nil
 	}
 
 	usage := ""