diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationFragment.kt
index 0f25c63e2a..1108035f12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationFragment.kt
@@ -58,7 +58,7 @@ class DonorErrorConfigurationFragment : DSLSettingsFragment() {
       secondaryButtonNoOutline(
         text = DSLSettingsText.from(R.string.preferences__internal_donor_error_clear),
         onClick = {
-          lifecycleDisposable += viewModel.clear().subscribe()
+          lifecycleDisposable += viewModel.clearErrorState().subscribe()
         }
       )
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationViewModel.kt
index aee2f131bd..3a1b20c4f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationViewModel.kt
@@ -108,10 +108,10 @@ class DonorErrorConfigurationViewModel : ViewModel() {
       }
     }.subscribeOn(Schedulers.io())
 
-    return clear().andThen(saveState)
+    return clearErrorState().andThen(saveState)
   }
 
-  fun clear(): Completable {
+  fun clearErrorState(): Completable {
     return Completable.fromAction {
       synchronized(SubscriptionReceiptRequestResponseJob.MUTEX) {
         SignalStore.donationsValues().setExpiredBadge(null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 767803eb26..6ce12c6008 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -408,8 +408,10 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       isDisplayingSubscriptionFailure = true;
     } else if (unexpectedSubscriptionCancellation != null && SignalStore.donationsValues().isUserManuallyCancelled()) {
       Log.w(TAG, "Unexpected cancellation detected but not displaying dialog because user manually cancelled their subscription: " + unexpectedSubscriptionCancellation, true);
+      SignalStore.donationsValues().setUnexpectedSubscriptionCancelationWatermark(subscriptionFailureTimestamp);
     } else if (unexpectedSubscriptionCancellation != null && !SignalStore.donationsValues().showCantProcessDialog()) {
       Log.w(TAG, "Unexpected cancellation detected but not displaying dialog because user has silenced it.", true);
+      SignalStore.donationsValues().setUnexpectedSubscriptionCancelationWatermark(subscriptionFailureTimestamp);
     }
 
     if (expiredBadge != null && !isDisplayingSubscriptionFailure) {