diff --git a/server/grpc/grpc.go b/server/grpc/grpc.go
index 972f4ba8..689cd7d3 100644
--- a/server/grpc/grpc.go
+++ b/server/grpc/grpc.go
@@ -118,6 +118,8 @@ func (g *grpcServer) configure(opts ...server.Option) {
 		o(&g.opts)
 	}
 
+	g.wg = wait(g.opts.Context)
+
 	maxMsgSize := g.getMaxMsgSize()
 
 	gopts := []grpc.ServerOption{