diff --git a/api/client/node/tasks.go b/api/client/node/tasks.go
index 0c044e3dd6..8d45bc743d 100644
--- a/api/client/node/tasks.go
+++ b/api/client/node/tasks.go
@@ -55,7 +55,7 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
 
 	filter := opts.filter.Value()
 	filter.Add("node", node.ID)
-	if !opts.all {
+	if !opts.all && !filter.Include("desired_state") {
 		filter.Add("desired_state", string(swarm.TaskStateRunning))
 		filter.Add("desired_state", string(swarm.TaskStateAccepted))