diff --git a/cmd/handler-utils.go b/cmd/handler-utils.go
index a4bc7079b..d27f48b71 100644
--- a/cmd/handler-utils.go
+++ b/cmd/handler-utils.go
@@ -19,6 +19,7 @@ package cmd
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -498,10 +499,9 @@ func proxyRequest(ctx context.Context, w http.ResponseWriter, r *http.Request, e
 		RoundTripper: ep.Transport,
 		ErrorHandler: func(w http.ResponseWriter, r *http.Request, err error) {
 			success = false
-			w.WriteHeader(http.StatusBadGateway)
-		},
-		Logger: func(err error) {
-			logger.LogIf(GlobalContext, err)
+			if err != nil && !errors.Is(err, context.Canceled) {
+				logger.LogIf(GlobalContext, err)
+			}
 		},
 	})