diff --git a/pkg/actor/grpc_server.go b/pkg/actor/grpc_server.go
index f41e773..78486c1 100644
--- a/pkg/actor/grpc_server.go
+++ b/pkg/actor/grpc_server.go
@@ -89,15 +89,14 @@ func NewControlServer[V any](addr string, pool GrainPool[V]) (*grpc.Server, erro
 		pool: pool,
 	}
 
+	log.Printf("gRPC server listening on %s", addr)
+
+	if err := grpcServer.Serve(lis); err != nil {
+		log.Fatalf("failed to serve gRPC: %v", err)
+	}
+
 	messages.RegisterControlPlaneServer(grpcServer, server)
 	reflection.Register(grpcServer)
 
-	log.Printf("gRPC server listening on %s", addr)
-	go func() {
-		if err := grpcServer.Serve(lis); err != nil {
-			log.Fatalf("failed to serve gRPC: %v", err)
-		}
-	}()
-
 	return grpcServer, nil
 }