diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt
index f46d760eb1..ac46bb430e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt
@@ -135,7 +135,13 @@ class StripePaymentInProgressViewModel(
           .map { (_, paymentMethod) -> paymentMethod ?: secure3DSAction.paymentMethodId!! }
       }
       .flatMapCompletable { stripeRepository.setDefaultPaymentMethod(it) }
-      .onErrorResumeNext { Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.SUBSCRIPTION, it)) }
+      .onErrorResumeNext {
+        if (it is DonationError) {
+          Completable.error(it)
+        } else {
+          Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.SUBSCRIPTION, it))
+        }
+      }
 
     disposables += setup.andThen(setLevel).subscribeBy(
       onError = { throwable ->