diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt
index 7b4581435..c4cb58fc9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt
@@ -102,7 +102,7 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
     lifecycleDisposable.bindTo(viewLifecycleOwner.lifecycle)
     lifecycleDisposable += viewModel.events.subscribe { event: DonationEvent ->
       when (event) {
-        is DonationEvent.GooglePayUnavailableError -> onGooglePayUnavailable(event.throwable)
+        is DonationEvent.GooglePayUnavailableError -> Unit
         is DonationEvent.PaymentConfirmationError -> onPaymentError(event.throwable)
         is DonationEvent.PaymentConfirmationSuccess -> onPaymentConfirmed(event.badge)
         DonationEvent.RequestTokenError -> onPaymentError(null)
@@ -169,16 +169,14 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
         )
       )
 
-      if (state.isGooglePayAvailable) {
-        space(DimensionUnit.DP.toPixels(16f).toInt())
+      space(DimensionUnit.DP.toPixels(16f).toInt())
 
-        customPref(
-          GooglePayButton.Model(
-            onClick = this@BoostFragment::onGooglePayButtonClicked,
-            isEnabled = state.stage == BoostState.Stage.READY
-          )
+      customPref(
+        GooglePayButton.Model(
+          onClick = this@BoostFragment::onGooglePayButtonClicked,
+          isEnabled = state.stage == BoostState.Stage.READY
         )
-      }
+      )
 
       secondaryButtonNoOutline(
         text = DSLSettingsText.from(R.string.SubscribeFragment__more_payment_options),
@@ -225,18 +223,6 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
     }
   }
 
-  private fun onGooglePayUnavailable(throwable: Throwable?) {
-    Log.w(TAG, "Google Pay error", throwable)
-    MaterialAlertDialogBuilder(requireContext())
-      .setTitle(R.string.DonationsErrors__google_pay_unavailable)
-      .setMessage(R.string.DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app)
-      .setPositiveButton(android.R.string.ok) { dialog, _ ->
-        dialog.dismiss()
-        findNavController().popBackStack()
-      }
-      .show()
-  }
-
   private fun startAnimationAboveSelectedBoost(view: View) {
     val animationView = getAnimationContainer(view)
     val viewProjection = Projection.relativeToViewRoot(view, null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt
index 108fce10a..50be135ba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt
@@ -80,7 +80,7 @@ class SubscribeFragment : DSLSettingsFragment(
     lifecycleDisposable.bindTo(viewLifecycleOwner.lifecycle)
     lifecycleDisposable += viewModel.events.subscribe {
       when (it) {
-        is DonationEvent.GooglePayUnavailableError -> onGooglePayUnavailable(it.throwable)
+        is DonationEvent.GooglePayUnavailableError -> Unit
         is DonationEvent.PaymentConfirmationError -> onPaymentError(it.throwable)
         is DonationEvent.PaymentConfirmationSuccess -> onPaymentConfirmed(it.badge)
         DonationEvent.RequestTokenError -> onPaymentError(null)
@@ -203,16 +203,14 @@ class SubscribeFragment : DSLSettingsFragment(
           }
         )
       } else {
-        if (state.isGooglePayAvailable) {
-          space(DimensionUnit.DP.toPixels(16f).toInt())
+        space(DimensionUnit.DP.toPixels(16f).toInt())
 
-          customPref(
-            GooglePayButton.Model(
-              onClick = this@SubscribeFragment::onGooglePayButtonClicked,
-              isEnabled = areFieldsEnabled && state.selectedSubscription != null
-            )
+        customPref(
+          GooglePayButton.Model(
+            onClick = this@SubscribeFragment::onGooglePayButtonClicked,
+            isEnabled = areFieldsEnabled && state.selectedSubscription != null
           )
-        }
+        )
 
         secondaryButtonNoOutline(
           text = DSLSettingsText.from(R.string.SubscribeFragment__more_payment_options),
@@ -259,18 +257,6 @@ class SubscribeFragment : DSLSettingsFragment(
     }
   }
 
-  private fun onGooglePayUnavailable(throwable: Throwable?) {
-    Log.w(TAG, "Google Pay error", throwable)
-    MaterialAlertDialogBuilder(requireContext())
-      .setTitle(R.string.DonationsErrors__google_pay_unavailable)
-      .setMessage(R.string.DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app)
-      .setPositiveButton(android.R.string.ok) { dialog, _ ->
-        dialog.dismiss()
-        findNavController().popBackStack()
-      }
-      .show()
-  }
-
   private fun onSubscriptionCancelled() {
     Snackbar.make(requireView(), R.string.SubscribeFragment__your_subscription_has_been_cancelled, Snackbar.LENGTH_LONG)
       .setTextColor(Color.WHITE)