diff --git a/frontend/lib/shared/payment_details_page.dart b/frontend/lib/shared/payment_details_page.dart
index a49cc70b..14a7b3a5 100644
--- a/frontend/lib/shared/payment_details_page.dart
+++ b/frontend/lib/shared/payment_details_page.dart
@@ -14,8 +14,9 @@ class PaymentDetailsPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final paymentMethods = ref.watch(paymentMethodProvider);
 
-    final paymentTypes =
-        paymentMethods?.map((method) => method.kind.split('_').first).toSet();
+    final paymentTypes = paymentMethods
+        ?.map((method) => method.kind.split('_').firstOrNull)
+        .toSet();
 
     final selectedPaymentMethod = useState(paymentMethods?.firstOrNull);
     final selectedPaymentType = useState(paymentTypes?.firstOrNull);
@@ -130,7 +131,8 @@ class PaymentDetailsPage extends HookConsumerWidget {
     ValueNotifier<PaymentMethod?> selectedPaymentMethod,
     List<PaymentMethod>? availablePaymentMethods,
   ) {
-    final paymentSubtype = selectedPaymentMethod.value?.kind.split('_').last;
+    final paymentSubtype =
+        selectedPaymentMethod.value?.kind.split('_').lastOrNull;
     final fee = (double.tryParse(selectedPaymentMethod.value?.fee ?? '0.00')
             ?.toStringAsFixed(2) ??
         '0.00');
diff --git a/frontend/lib/shared/search_payment_methods_page.dart b/frontend/lib/shared/search_payment_methods_page.dart
index 7b1406c6..4790bc79 100644
--- a/frontend/lib/shared/search_payment_methods_page.dart
+++ b/frontend/lib/shared/search_payment_methods_page.dart
@@ -73,7 +73,7 @@ class SearchPaymentMethodsPage extends HookWidget {
       itemBuilder: (context, index) {
         final currentPaymentMethod =
             filteredPaymentMethods?.elementAtOrNull(index);
-        final paymentSubtype = currentPaymentMethod?.kind.split('_').last;
+        final paymentSubtype = currentPaymentMethod?.kind.split('_').lastOrNull;
         final fee = (double.tryParse(currentPaymentMethod?.fee ?? '0.00')
                 ?.toStringAsFixed(2) ??
             '0.00');