diff --git a/client/httpapi/request.go b/client/httpapi/request.go
index 58c61ac6780..dd5293b7a6e 100644
--- a/client/httpapi/request.go
+++ b/client/httpapi/request.go
@@ -7,6 +7,7 @@ import (
 )
 
 type Request struct {
+	Ctx     context.Context
 	ApiBase string
 	Command string
 	Args    []string
@@ -25,6 +26,7 @@ func NewRequest(ctx context.Context, url, command string, args ...string) *Reque
 		"stream-channels": "true",
 	}
 	return &Request{
+		Ctx:     ctx,
 		ApiBase: url + "/api/v0",
 		Command: command,
 		Args:    args,
diff --git a/client/httpapi/response.go b/client/httpapi/response.go
index 339c7365861..29ae38c69ee 100644
--- a/client/httpapi/response.go
+++ b/client/httpapi/response.go
@@ -95,6 +95,8 @@ func (r *Request) Send(c *http.Client) (*Response, error) {
 		return nil, err
 	}
 
+	req = req.WithContext(r.Ctx)
+
 	// Add any headers that were supplied via the RequestBuilder.
 	for k, v := range r.Headers {
 		req.Header.Add(k, v)