diff --git a/agent/reverseproxy/reverseproxy.go b/agent/reverseproxy/reverseproxy.go
index aa12e56..3050f2d 100644
--- a/agent/reverseproxy/reverseproxy.go
+++ b/agent/reverseproxy/reverseproxy.go
@@ -43,7 +43,7 @@ func NewReverseProxy(conf config.ListenerConfig, logger log.Logger) *ReverseProx
 }
 
 func (p *ReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if p.timeout != 0 {
+	if p.timeout != 0 && r.Header.Get("upgrade") != "websocket" {
 		ctx, cancel := context.WithTimeout(r.Context(), p.timeout)
 		defer cancel()
 
diff --git a/server/proxy/httpproxy.go b/server/proxy/httpproxy.go
index 09d20d3..e92c349 100644
--- a/server/proxy/httpproxy.go
+++ b/server/proxy/httpproxy.go
@@ -92,7 +92,7 @@ func (p *HTTPProxy) ServeHTTPWithUpstream(
 	endpointID string,
 	upstream upstream.Upstream,
 ) {
-	if p.timeout != 0 {
+	if p.timeout != 0 && r.Header.Get("upgrade") != "websocket" {
 		ctx, cancel := context.WithTimeout(r.Context(), p.timeout)
 		defer cancel()