diff --git a/lib/features/payment/payment_details_page.dart b/lib/features/payment/payment_details_page.dart
index 3b904196..a17f9ee5 100644
--- a/lib/features/payment/payment_details_page.dart
+++ b/lib/features/payment/payment_details_page.dart
@@ -267,6 +267,7 @@ class PaymentDetailsPage extends HookConsumerWidget {
             updatedPaymentState.selectedPayoutKind ?? '',
             updatedPaymentState.payinDetails,
             updatedPaymentState.payoutDetails,
+            claims: updatedPaymentState.paymentDetailsState?.credentialsJwt,
           );
 
       if (context.mounted && rfq.value != null) {
diff --git a/lib/features/payment/payment_state.dart b/lib/features/payment/payment_state.dart
index 3bb5e122..ec230836 100644
--- a/lib/features/payment/payment_state.dart
+++ b/lib/features/payment/payment_state.dart
@@ -83,7 +83,10 @@ class PaymentState {
         return null;
       case TransactionType.send:
         // TODO(ethan-tbd): remove hardcoded map
-        return {'lnAddress': paymentDetailsState?.paymentName ?? ''};
+        return {
+          'lnAddress':
+              paymentDetailsState?.moneyAddresses?.firstOrNull?.urn ?? '',
+        };
       case TransactionType.withdraw:
         return paymentDetailsState?.formData;
     }
diff --git a/lib/features/tbdex/tbdex_service.dart b/lib/features/tbdex/tbdex_service.dart
index fe9ed43f..99b5701c 100644
--- a/lib/features/tbdex/tbdex_service.dart
+++ b/lib/features/tbdex/tbdex_service.dart
@@ -167,7 +167,7 @@ class TbdexService {
     await Future.delayed(const Duration(milliseconds: 500));
 
     try {
-      await TbdexHttpClient.createExchange(rfq, replyTo: rfq.metadata.from);
+      await TbdexHttpClient.createExchange(rfq);
     } on Exception {
       rethrow;
     }