diff --git a/cmd/server/grpc_server.go b/cmd/server/grpc_server.go
index 16da47f05..f983bb158 100644
--- a/cmd/server/grpc_server.go
+++ b/cmd/server/grpc_server.go
@@ -33,7 +33,7 @@ import (
 func runGrpcServer(ctx context.Context, c *cli.Command, _store store.Store) error {
 	lis, err := net.Listen("tcp", c.String("grpc-addr"))
 	if err != nil {
-		log.Fatal().Err(err).Msg("failed to listen on grpc-addr") //nolint:forbidigo
+		return fmt.Errorf("failed to listen on grpc-addr: %w", err)
 	}
 
 	jwtSecret := c.String("grpc-secret")