diff --git a/quic/quic_protocol.go b/quic/quic_protocol.go
index 8c7baf87..7b23fcbb 100644
--- a/quic/quic_protocol.go
+++ b/quic/quic_protocol.go
@@ -39,6 +39,9 @@ const (
 	HandshakeIdleTimeout = 5 * time.Second
 	MaxIdleTimeout       = 5 * time.Second
 	MaxIdlePingPeriod    = 1 * time.Second
+
+	// MaxIncomingStreams is 2^60, which is the maximum supported value by Quic-Go
+	MaxIncomingStreams = 1 << 60
 )
 
 // RequestServerStream is a stream to serve requests
diff --git a/supervisor/tunnel.go b/supervisor/tunnel.go
index d2abce07..24f909ef 100644
--- a/supervisor/tunnel.go
+++ b/supervisor/tunnel.go
@@ -597,8 +597,8 @@ func (e *EdgeTunnelServer) serveQUIC(
 		HandshakeIdleTimeout:  quicpogs.HandshakeIdleTimeout,
 		MaxIdleTimeout:        quicpogs.MaxIdleTimeout,
 		KeepAlivePeriod:       quicpogs.MaxIdlePingPeriod,
-		MaxIncomingStreams:    connection.MaxConcurrentStreams,
-		MaxIncomingUniStreams: connection.MaxConcurrentStreams,
+		MaxIncomingStreams:    quicpogs.MaxIncomingStreams,
+		MaxIncomingUniStreams: quicpogs.MaxIncomingStreams,
 		EnableDatagrams:       true,
 		MaxDatagramFrameSize:  quicpogs.MaxDatagramFrameSize,
 		Tracer:                quicpogs.NewClientTracer(connLogger.Logger(), connIndex),