diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt
index 3ac610517..f87947aae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.badges.gifts.thanks
 
 import android.os.Bundle
 import androidx.fragment.app.FragmentManager
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import org.signal.core.util.DimensionUnit
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.models.Badge
@@ -49,7 +50,7 @@ class GiftThanksSheet : DSLSettingsBottomSheetFragment() {
     BadgePreview.register(adapter)
 
     lifecycleDisposable.bindTo(viewLifecycleOwner)
-    lifecycleDisposable += Recipient.observable(recipientId).subscribe {
+    lifecycleDisposable += Recipient.observable(recipientId).observeOn(AndroidSchedulers.mainThread()).subscribe {
       adapter.submitList(getConfiguration(it).toMappingModelList())
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt
index 48650b144..9e8eb5987 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt
@@ -104,7 +104,7 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() {
         onRedemptionError(donationError)
       }
 
-    lifecycleDisposable += viewModel.state.subscribe { state ->
+    lifecycleDisposable += viewModel.state.observeOn(AndroidSchedulers.mainThread()).subscribe { state ->
       adapter.submitList(getConfiguration(state).toMappingModelList())
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt
index 7d0a57eef..5a1d6cd75 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.badges.gifts.viewgift.sent
 import android.os.Bundle
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import org.signal.core.util.DimensionUnit
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.gifts.viewgift.ViewGiftRepository
@@ -55,7 +56,7 @@ class ViewSentGiftBottomSheet : DSLSettingsBottomSheetFragment() {
     BadgeDisplay112.register(adapter)
 
     lifecycleDisposable.bindTo(viewLifecycleOwner)
-    lifecycleDisposable += viewModel.state.subscribe { state ->
+    lifecycleDisposable += viewModel.state.observeOn(AndroidSchedulers.mainThread()).subscribe { state ->
       adapter.submitList(getConfiguration(state).toMappingModelList())
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/DonationReceiptRedemptionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/DonationReceiptRedemptionJob.java
index 4cd18cee5..25cc4f8b1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/DonationReceiptRedemptionJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/DonationReceiptRedemptionJob.java
@@ -24,6 +24,7 @@ import org.whispersystems.signalservice.internal.EmptyResponse;
 import org.whispersystems.signalservice.internal.ServiceResponse;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -179,6 +180,7 @@ public class DonationReceiptRedemptionJob extends BaseJob {
                                                              markedMessageInfo.getSyncMessageId().getRecipientId(),
                                                              markedMessageInfo.getSyncMessageId().getTimetamp(),
                                                              markedMessageInfo.getMessageId()));
+        MultiDeviceViewedUpdateJob.enqueue(Collections.singletonList(markedMessageInfo.getSyncMessageId()));
       }
     }
   }