diff --git a/client/http.go b/client/http.go
index ea4fcb8..d7d72a2 100644
--- a/client/http.go
+++ b/client/http.go
@@ -100,7 +100,7 @@ func (p *HTTPClient) Request(ctx context.Context, args *Filter) (*drone.Stage, e
 
 // Accept accepts the build stage for execution.
 func (p *HTTPClient) Accept(ctx context.Context, stage *drone.Stage) error {
-	uri := fmt.Sprintf(endpointStage+"?machine=%s", stage.ID, url.PathEscape(stage.Machine))
+	uri := fmt.Sprintf(endpointStage+"?machine=%s", stage.ID, url.QueryEscape(stage.Machine))
 	src := stage
 	dst := new(drone.Stage)
 	_, err := p.retry(ctx, uri, "POST", nil, dst)