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 278d4cca9..b68db5974 100644
--- a/apps/edr-freight-api/src/modules/billing/billing.service.ts
+++ b/apps/edr-freight-api/src/modules/billing/billing.service.ts
@@ -691,7 +691,13 @@ export class BillingService {
       status: invoice.status,
       paymentId: invoice.paymentId ?? null,
     };
-    this.events.emit(`${invoice.source}.invoice.${event}`, payload);
+    this.events
+      .emitAsync(`${invoice.source}.invoice.${event}`, payload)
+      .catch((err) =>
+        this.logger.error(
+          `Listener for ${invoice.source}.invoice.${event} (invoice ${invoice.id}) failed: ${err instanceof Error ? err.message : String(err)}`,
+        ),
+      );
   }
 
   // ── Payment reconciliation (by source) ───────────────────────────────────────
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 3bfb838b4..30f41813b 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
@@ -143,9 +143,16 @@ export class BookingInvoiceService {
         { id: bookingId },
         { paymentStatus: "PAID", status: "PAID" },
       );
-      await this.firstMile.acceptBooking(bookingId);
     });
 
+    try {
+      await this.firstMile.acceptBooking(bookingId);
+    } catch (err) {
+      this.logger.error(
+        `Error accepting first-mile after payment: ${err instanceof Error ? err.message : String(err)}`,
+      );
+    }
+
     try {
       await this.bookingBatch.ensurePaidBookingAllocated(bookingId);
     } catch (err) {