diff --git a/gateway/server.go b/gateway/server.go
index f2b9ac86e..e1af48cef 100644
--- a/gateway/server.go
+++ b/gateway/server.go
@@ -190,6 +190,8 @@ func (s *Server) buildHttpHandler(target *HttpClientConf) http.HandlerFunc {
 			ctx, cancel := context.WithTimeout(r.Context(), timeout)
 			defer cancel()
 			req = req.WithContext(ctx)
+		} else {
+			req = req.WithContext(r.Context())
 		}
 
 		resp, err := httpc.DoRequest(req)