diff --git a/server/grpc/grpc_web.go b/server/grpc/grpc_web.go
index c2fc023a24f0..e08f007c73f0 100644
--- a/server/grpc/grpc_web.go
+++ b/server/grpc/grpc_web.go
@@ -24,12 +24,9 @@ func StartGRPCWeb(grpcSrv *grpc.Server, config config.Config) (*http.Server, err
 	}
 
 	wrappedServer := grpcweb.WrapServer(grpcSrv, options...)
-	handler := func(resp http.ResponseWriter, req *http.Request) {
-		wrappedServer.ServeHTTP(resp, req)
-	}
 	grpcWebSrv := &http.Server{
 		Addr:    config.GRPCWeb.Address,
-		Handler: http.HandlerFunc(handler),
+		Handler: wrappedServer,
 	}
 
 	errCh := make(chan error)