diff --git a/server/server.go b/server/server.go
index <HASH>..<HASH> 100644
--- a/server/server.go
+++ b/server/server.go
@@ -269,6 +269,15 @@ func (server *BgpServer) Serve() {
 		}
 
 		select {
+		case grpcReq := <-server.GrpcReqCh:
+			m := server.handleGrpc(grpcReq)
+			if len(m) > 0 {
+				senderMsgs = append(senderMsgs, m...)
+			}
+		default:
+		}
+
+		select {
 		case c := <-server.rpkiConfigCh:
 			server.roaClient, _ = newROAClient(c)
 		case c := <-server.bmpConfigCh:
server: play favorites with grpc requests