diff --git a/client/container_wait.go b/client/container_wait.go
index 6ab8c1da96..e9b134c9d2 100644
--- a/client/container_wait.go
+++ b/client/container_wait.go
@@ -33,7 +33,9 @@ func (cli *Client) ContainerWait(ctx context.Context, containerID string, condit
 	errC := make(chan error, 1)
 
 	query := url.Values{}
-	query.Set("condition", string(condition))
+	if condition != "" {
+		query.Set("condition", string(condition))
+	}
 
 	resp, err := cli.post(ctx, "/containers/"+containerID+"/wait", query, nil, nil)
 	if err != nil {