diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
index 573b5d4e38..9055c350f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
@@ -55,8 +55,6 @@ public class PaymentsHomeFragment extends LoggingFragment {
 
   private PaymentsHomeViewModel viewModel;
 
-  private final OnBackPressed onBackPressed = new OnBackPressed();
-
   public PaymentsHomeFragment() {
     super(R.layout.payments_home_fragment);
   }
@@ -270,7 +268,7 @@ public class PaymentsHomeFragment extends LoggingFragment {
       }
     });
 
-    requireActivity().getOnBackPressedDispatcher().addCallback(onBackPressed);
+    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressed());
   }
 
   @Override
@@ -279,12 +277,6 @@ public class PaymentsHomeFragment extends LoggingFragment {
     viewModel.checkPaymentActivationState();
   }
 
-  @Override
-  public void onDestroyView() {
-    super.onDestroyView();
-    onBackPressed.setEnabled(false);
-  }
-
   private void showUpdateIsRequiredDialog() {
     new MaterialAlertDialogBuilder(requireContext())
         .setTitle(getString(R.string.PaymentsHomeFragment__update_required))