diff --git a/apps/edr-freight-api/src/modules/billing/billing.service.ts b/apps/edr-freight-api/src/modules/billing/billing.service.ts
index b68db5974..baf3fa3f3 100644
--- a/apps/edr-freight-api/src/modules/billing/billing.service.ts
+++ b/apps/edr-freight-api/src/modules/billing/billing.service.ts
@@ -829,7 +829,10 @@ export class BillingService {
   ): Promise<void> {
     const mg = manager ?? this.dataSource.manager;
     const invoice = await mg.findOne(Invoice, {
-      where: { id: invoiceId, status: In([Freight.InvoiceStatus.Draft, ...OPEN_STATUSES]) },
+      where: {
+        id: invoiceId,
+        status: In([Freight.InvoiceStatus.Draft, ...OPEN_STATUSES]),
+      },
     });
     if (!invoice) return;
     await mg.update(
@@ -882,7 +885,7 @@ export class BillingService {
       // in the domain via `${source}.invoice.paid`. Neither billing nor the payment
       // service branches on a domain-specific reference type.
       referenceType: PaymentReferenceType.SHIPMENT,
-      orderRef: invoice.invoiceNumber,
+      orderRef: invoice.invoiceNumber.replace("-", "_"),
       amountMinor: Math.round(Number(invoice.balanceAmount)),
       currency: invoice.currency,
       reason: `Payment for invoice ${invoice.invoiceNumber}`,
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts
index 30f41813b..1b8eddeca 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts
@@ -5,7 +5,6 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import { OnEvent } from "@nestjs/event-emitter";
 import { Freight } from "@edr/types";
 import { DataSource, EntityManager } from "typeorm";
 
@@ -95,8 +94,10 @@ export class BookingInvoiceService {
    * reactions live here (not in the payment process): each invoice type advances
    * the booking its own way. Only PREPAID exists today.
    */
-  @OnEvent("booking.invoice.paid")
   async onBookingInvoicePaid(payload: InvoiceEventPayload): Promise<void> {
+    this.logger.log(
+      `onBookingInvoicePaid trigger for ${payload.sourceId} from ${payload.invoiceId}`,
+    );
     switch (payload.type) {
       case "PREPAID":
         await this.advanceBookingOnPayment(payload.sourceId);