diff --git a/daemon_none.go b/daemon_none.go
index 65f9f37be2..6fbd000125 100644
--- a/daemon_none.go
+++ b/daemon_none.go
@@ -12,8 +12,10 @@ import (
 
 func newDaemonCommand() *cobra.Command {
 	return &cobra.Command{
-		Use:    "daemon",
-		Hidden: true,
+		Use:                "daemon",
+		Hidden:             true,
+		Args:               cobra.ArbitraryArgs,
+		DisableFlagParsing: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runDaemon()
 		},
diff --git a/daemon_none_test.go b/daemon_none_test.go
index 32032fe1b3..bd42add986 100644
--- a/daemon_none_test.go
+++ b/daemon_none_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestDaemonCommand(t *testing.T) {
 	cmd := newDaemonCommand()
-	cmd.SetArgs([]string{"--help"})
+	cmd.SetArgs([]string{"--version"})
 	err := cmd.Execute()
 
 	assert.Error(t, err, "Please run `dockerd`")