diff --git a/command/node/ps.go b/command/node/ps.go
index 8591f04669..a034721d24 100644
--- a/command/node/ps.go
+++ b/command/node/ps.go
@@ -17,7 +17,6 @@ import (
 
 type psOptions struct {
 	nodeIDs   []string
-	all       bool
 	noResolve bool
 	noTrunc   bool
 	filter    opts.FilterOpt
@@ -44,7 +43,6 @@ func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
 	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output")
 	flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names")
 	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-	flags.BoolVarP(&opts.all, "all", "a", false, "Show all tasks (default shows tasks that are or will be running)")
 
 	return cmd
 }
@@ -74,11 +72,6 @@ func runPs(dockerCli *command.DockerCli, opts psOptions) error {
 		filter := opts.filter.Value()
 		filter.Add("node", node.ID)
 
-		if !opts.all && !filter.Include("desired-state") {
-			filter.Add("desired-state", string(swarm.TaskStateRunning))
-			filter.Add("desired-state", string(swarm.TaskStateAccepted))
-		}
-
 		nodeTasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter})
 		if err != nil {
 			errs = append(errs, err.Error())
diff --git a/command/service/ps.go b/command/service/ps.go
index 0028507c22..cf94ad7374 100644
--- a/command/service/ps.go
+++ b/command/service/ps.go
@@ -2,7 +2,6 @@ package service
 
 import (
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/cli/command/idresolver"
@@ -15,7 +14,6 @@ import (
 
 type psOptions struct {
 	serviceID string
-	all       bool
 	quiet     bool
 	noResolve bool
 	noTrunc   bool
@@ -39,7 +37,6 @@ func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
 	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output")
 	flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names")
 	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-	flags.BoolVarP(&opts.all, "all", "a", false, "Show all tasks (default shows tasks that are or will be running)")
 
 	return cmd
 }
@@ -67,11 +64,6 @@ func runPS(dockerCli *command.DockerCli, opts psOptions) error {
 		}
 	}
 
-	if !opts.all && !filter.Include("desired-state") {
-		filter.Add("desired-state", string(swarm.TaskStateRunning))
-		filter.Add("desired-state", string(swarm.TaskStateAccepted))
-	}
-
 	tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter})
 	if err != nil {
 		return err