diff --git a/net/grpc/gateway/examples/helloworld/envoy.yaml b/net/grpc/gateway/examples/helloworld/envoy.yaml
index daea5bf..1a642de 100644
--- a/net/grpc/gateway/examples/helloworld/envoy.yaml
+++ b/net/grpc/gateway/examples/helloworld/envoy.yaml
@@ -24,6 +24,7 @@ static_resources:
               - match: { prefix: "/" }
                 route:
                   cluster: greeter_service
+                  timeout: 0s
                   max_stream_duration:
                     grpc_timeout_header_max: 0s
               cors:
diff --git a/test/interop/envoy.yaml b/test/interop/envoy.yaml
index 2bccf79..5c14444 100644
--- a/test/interop/envoy.yaml
+++ b/test/interop/envoy.yaml
@@ -24,6 +24,7 @@ static_resources:
               - match: { prefix: "/" }
                 route:
                   cluster: interop_service
+                  timeout: 0s
                   max_stream_duration:
                     grpc_timeout_header_max: 0s
               cors: