diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
index 8951feaa88..84b869001f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
@@ -200,6 +200,7 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
           if (it.status == 200 || it.status == 204) {
             Log.d(TAG, "Successfully set user subscription to level $subscriptionLevel with response code ${it.status}", true)
             SignalStore.donationsValues().clearUserManuallyCancelled()
+            scheduleSyncForAccountRecordChange()
             SignalStore.donationsValues().clearLevelOperations()
             LevelUpdate.updateProcessingState(false)
             Completable.complete()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeViewModel.kt
index 06898bf6e5..57dca4e999 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeViewModel.kt
@@ -188,6 +188,7 @@ class SubscribeViewModel(
         SignalStore.donationsValues().markUserManuallyCancelled()
         refreshActiveSubscription()
         MultiDeviceSubscriptionSyncRequestJob.enqueue()
+        donationPaymentRepository.scheduleSyncForAccountRecordChange()
         store.update { it.copy(stage = SubscribeState.Stage.READY) }
       },
       onError = { throwable ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
index 2b787428f7..e01f248b6b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
@@ -91,26 +91,27 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
       subscriber = local.getSubscriber();
     }
 
-    byte[]                               unknownFields          = remote.serializeUnknownFields();
-    String                               avatarUrlPath          = remote.getAvatarUrlPath().or(local.getAvatarUrlPath()).or("");
-    byte[]                               profileKey             = remote.getProfileKey().or(local.getProfileKey()).orNull();
-    boolean                              noteToSelfArchived     = remote.isNoteToSelfArchived();
-    boolean                              noteToSelfForcedUnread = remote.isNoteToSelfForcedUnread();
-    boolean                              readReceipts           = remote.isReadReceiptsEnabled();
-    boolean                              typingIndicators       = remote.isTypingIndicatorsEnabled();
-    boolean                              sealedSenderIndicators = remote.isSealedSenderIndicatorsEnabled();
-    boolean                              linkPreviews           = remote.isLinkPreviewsEnabled();
-    boolean                              unlisted               = remote.isPhoneNumberUnlisted();
-    List<PinnedConversation>             pinnedConversations    = remote.getPinnedConversations();
-    AccountRecord.PhoneNumberSharingMode phoneNumberSharingMode = remote.getPhoneNumberSharingMode();
-    boolean                              preferContactAvatars   = remote.isPreferContactAvatars();
-    int                                  universalExpireTimer   = remote.getUniversalExpireTimer();
-    boolean                              primarySendsSms        = local.isPrimarySendsSms();
-    String                               e164                   = local.getE164();
-    List<String>                         defaultReactions       = remote.getDefaultReactions().size() > 0 ? remote.getDefaultReactions() : local.getDefaultReactions();
-    boolean                              displayBadgesOnProfile = remote.isDisplayBadgesOnProfile();
-    boolean                              matchesRemote          = doParamsMatch(remote, unknownFields, givenName, familyName, avatarUrlPath, profileKey, noteToSelfArchived, noteToSelfForcedUnread, readReceipts, typingIndicators, sealedSenderIndicators, linkPreviews, phoneNumberSharingMode, unlisted, pinnedConversations, preferContactAvatars, payments, universalExpireTimer, primarySendsSms, e164, defaultReactions, subscriber, displayBadgesOnProfile);
-    boolean                              matchesLocal           = doParamsMatch(local, unknownFields, givenName, familyName, avatarUrlPath, profileKey, noteToSelfArchived, noteToSelfForcedUnread, readReceipts, typingIndicators, sealedSenderIndicators, linkPreviews, phoneNumberSharingMode, unlisted, pinnedConversations, preferContactAvatars, payments, universalExpireTimer, primarySendsSms, e164, defaultReactions, subscriber, displayBadgesOnProfile);
+    byte[]                               unknownFields                 = remote.serializeUnknownFields();
+    String                               avatarUrlPath                 = remote.getAvatarUrlPath().or(local.getAvatarUrlPath()).or("");
+    byte[]                               profileKey                    = remote.getProfileKey().or(local.getProfileKey()).orNull();
+    boolean                              noteToSelfArchived            = remote.isNoteToSelfArchived();
+    boolean                              noteToSelfForcedUnread        = remote.isNoteToSelfForcedUnread();
+    boolean                              readReceipts                  = remote.isReadReceiptsEnabled();
+    boolean                              typingIndicators              = remote.isTypingIndicatorsEnabled();
+    boolean                              sealedSenderIndicators        = remote.isSealedSenderIndicatorsEnabled();
+    boolean                              linkPreviews                  = remote.isLinkPreviewsEnabled();
+    boolean                              unlisted                      = remote.isPhoneNumberUnlisted();
+    List<PinnedConversation>             pinnedConversations           = remote.getPinnedConversations();
+    AccountRecord.PhoneNumberSharingMode phoneNumberSharingMode        = remote.getPhoneNumberSharingMode();
+    boolean                              preferContactAvatars          = remote.isPreferContactAvatars();
+    int                                  universalExpireTimer          = remote.getUniversalExpireTimer();
+    boolean                              primarySendsSms               = local.isPrimarySendsSms();
+    String                               e164                          = local.getE164();
+    List<String>                         defaultReactions              = remote.getDefaultReactions().size() > 0 ? remote.getDefaultReactions() : local.getDefaultReactions();
+    boolean                              displayBadgesOnProfile        = remote.isDisplayBadgesOnProfile();
+    boolean                              subscriptionManuallyCancelled = remote.isSubscriptionManuallyCancelled();
+    boolean                              matchesRemote                 = doParamsMatch(remote, unknownFields, givenName, familyName, avatarUrlPath, profileKey, noteToSelfArchived, noteToSelfForcedUnread, readReceipts, typingIndicators, sealedSenderIndicators, linkPreviews, phoneNumberSharingMode, unlisted, pinnedConversations, preferContactAvatars, payments, universalExpireTimer, primarySendsSms, e164, defaultReactions, subscriber, displayBadgesOnProfile, subscriptionManuallyCancelled);
+    boolean                              matchesLocal                  = doParamsMatch(local, unknownFields, givenName, familyName, avatarUrlPath, profileKey, noteToSelfArchived, noteToSelfForcedUnread, readReceipts, typingIndicators, sealedSenderIndicators, linkPreviews, phoneNumberSharingMode, unlisted, pinnedConversations, preferContactAvatars, payments, universalExpireTimer, primarySendsSms, e164, defaultReactions, subscriber, displayBadgesOnProfile, subscriptionManuallyCancelled);
 
     if (matchesRemote) {
       return remote;
@@ -141,6 +142,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
                                     .setDefaultReactions(defaultReactions)
                                     .setSubscriber(subscriber)
                                     .setDisplayBadgesOnProfile(displayBadgesOnProfile)
+                                    .setSubscriptionManuallyCancelled(subscriptionManuallyCancelled)
                                     .build();
     }
   }
@@ -182,7 +184,8 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
                                        String e164,
                                        @NonNull List <String> defaultReactions,
                                        @NonNull SignalAccountRecord.Subscriber subscriber,
-                                       boolean displayBadgesOnProfile)
+                                       boolean displayBadgesOnProfile,
+                                       boolean subscriptionManuallyCancelled)
   {
     return Arrays.equals(contact.serializeUnknownFields(), unknownFields)        &&
            Objects.equals(contact.getGivenName().or(""), givenName)              &&
@@ -205,6 +208,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
            contact.isPrimarySendsSms() == primarySendsSms                        &&
            Objects.equals(contact.getPinnedConversations(), pinnedConversations) &&
            Objects.equals(contact.getSubscriber(), subscriber)                   &&
-           contact.isDisplayBadgesOnProfile() == displayBadgesOnProfile;
+           contact.isDisplayBadgesOnProfile() == displayBadgesOnProfile          &&
+           contact.isSubscriptionManuallyCancelled() == subscriptionManuallyCancelled;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
index c3cbca91b6..6d9286edea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
@@ -134,6 +134,7 @@ public final class StorageSyncHelper {
                                                          .setDefaultReactions(SignalStore.emojiValues().getReactions())
                                                          .setSubscriber(StorageSyncModels.localToRemoteSubscriber(SignalStore.donationsValues().getSubscriber()))
                                                          .setDisplayBadgesOnProfile(SignalStore.donationsValues().getDisplayBadgesOnProfile())
+                                                         .setSubscriptionManuallyCancelled(SignalStore.donationsValues().isUserManuallyCancelled())
                                                          .build();
 
     return SignalStorageRecord.forAccount(account);
@@ -159,6 +160,12 @@ public final class StorageSyncHelper {
     SignalStore.emojiValues().setReactions(update.getNew().getDefaultReactions());
     SignalStore.donationsValues().setDisplayBadgesOnProfile(update.getNew().isDisplayBadgesOnProfile());
 
+    if (update.getNew().isSubscriptionManuallyCancelled()) {
+      SignalStore.donationsValues().markUserManuallyCancelled();
+    } else {
+      SignalStore.donationsValues().clearUserManuallyCancelled();
+    }
+
     Subscriber subscriber = StorageSyncModels.remoteToLocalSubscriber(update.getNew().getSubscriber());
     if (subscriber != null) {
       SignalStore.donationsValues().setSubscriber(subscriber);
diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java
index b504b42003..1bd8f51ef2 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java
@@ -162,6 +162,10 @@ public final class SignalAccountRecord implements SignalRecord {
         diff.add("DisplayBadgesOnProfile");
       }
 
+      if (!Objects.equals(this.isSubscriptionManuallyCancelled(), that.isSubscriptionManuallyCancelled())) {
+        diff.add("SubscriptionManuallyCancelled");
+      }
+
       return diff.toString();
     } else {
       return "Different class. " + getClass().getSimpleName() + " | " + other.getClass().getSimpleName();
@@ -260,6 +264,10 @@ public final class SignalAccountRecord implements SignalRecord {
     return proto.getDisplayBadgesOnProfile();
   }
 
+  public boolean isSubscriptionManuallyCancelled() {
+    return proto.getSubscriptionManuallyCancelled();
+  }
+
   AccountRecord toProto() {
     return proto;
   }
@@ -588,6 +596,11 @@ public final class SignalAccountRecord implements SignalRecord {
       return this;
     }
 
+    public Builder setSubscriptionManuallyCancelled(boolean subscriptionManuallyCancelled) {
+      builder.setSubscriptionManuallyCancelled(subscriptionManuallyCancelled);
+      return this;
+    }
+
     public SignalAccountRecord build() {
       AccountRecord proto = builder.build();
 
diff --git a/libsignal/service/src/main/proto/StorageService.proto b/libsignal/service/src/main/proto/StorageService.proto
index be5e2e002b..14ace4e3f2 100644
--- a/libsignal/service/src/main/proto/StorageService.proto
+++ b/libsignal/service/src/main/proto/StorageService.proto
@@ -128,27 +128,28 @@ message AccountRecord {
     }
   }
 
-           bytes                  profileKey             = 1;
-           string                 givenName              = 2;
-           string                 familyName             = 3;
-           string                 avatarUrlPath          = 4;
-           bool                   noteToSelfArchived     = 5;
-           bool                   readReceipts           = 6;
-           bool                   sealedSenderIndicators = 7;
-           bool                   typingIndicators       = 8;
-           bool                   proxiedLinkPreviews    = 9;
-           bool                   noteToSelfMarkedUnread = 10;
-           bool                   linkPreviews           = 11;
-           PhoneNumberSharingMode phoneNumberSharingMode = 12;
-           bool                   unlistedPhoneNumber    = 13;
-  repeated PinnedConversation     pinnedConversations    = 14;
-           bool                   preferContactAvatars   = 15;
-           Payments               payments               = 16;
-           uint32                 universalExpireTimer   = 17;
-           bool                   primarySendsSms        = 18;
-           string                 e164                   = 19;
-  repeated string                 preferredReactionEmoji = 20;
-           bytes                  subscriberId           = 21;
-           string                 subscriberCurrencyCode = 22;
-           bool                   displayBadgesOnProfile = 23;
+           bytes                  profileKey                    = 1;
+           string                 givenName                     = 2;
+           string                 familyName                    = 3;
+           string                 avatarUrlPath                 = 4;
+           bool                   noteToSelfArchived            = 5;
+           bool                   readReceipts                  = 6;
+           bool                   sealedSenderIndicators        = 7;
+           bool                   typingIndicators              = 8;
+           bool                   proxiedLinkPreviews           = 9;
+           bool                   noteToSelfMarkedUnread        = 10;
+           bool                   linkPreviews                  = 11;
+           PhoneNumberSharingMode phoneNumberSharingMode        = 12;
+           bool                   unlistedPhoneNumber           = 13;
+  repeated PinnedConversation     pinnedConversations           = 14;
+           bool                   preferContactAvatars          = 15;
+           Payments               payments                      = 16;
+           uint32                 universalExpireTimer          = 17;
+           bool                   primarySendsSms               = 18;
+           string                 e164                          = 19;
+  repeated string                 preferredReactionEmoji        = 20;
+           bytes                  subscriberId                  = 21;
+           string                 subscriberCurrencyCode        = 22;
+           bool                   displayBadgesOnProfile        = 23;
+           bool                   subscriptionManuallyCancelled = 24;
 }