diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt
index b699e8b26d..07b2576f8c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt
@@ -470,7 +470,6 @@ open class MessageContentProcessor(private val context: Context) {
 
       content.syncMessage != null -> {
         SignalStore.account.isMultiDevice = true
-        SignalStore.misc.lastSyncMessageSeenTimeMs = System.currentTimeMillis()
 
         SyncMessageProcessor.process(
           context,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
index 13c4edaa71..d541319d81 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
@@ -287,6 +287,8 @@ object SyncMessageProcessor {
         log(envelope.clientTimestamp!!, "Got a sent transcript while in reCAPTCHA mode. Assuming we're good to message again.")
         RateLimitUtil.retryAllRateLimitedMessages(context)
       }
+
+      SignalStore.misc.lastSyncMessageSeenTimeMs = System.currentTimeMillis()
     } catch (e: MmsException) {
       throw StorageFailedException(e, metadata.sourceServiceId.toString(), metadata.sourceDeviceId)
     }
@@ -1010,6 +1012,8 @@ object SyncMessageProcessor {
       PushProcessEarlyMessagesJob.enqueue()
     }
 
+    SignalStore.misc.lastSyncMessageSeenTimeMs = System.currentTimeMillis()
+
     AppDependencies
       .messageNotifier
       .apply {
@@ -1045,6 +1049,8 @@ object SyncMessageProcessor {
     SignalDatabase.messages.setIncomingMessagesViewed(toMarkViewed)
     SignalDatabase.messages.setOutgoingGiftsRevealed(toMarkViewed)
 
+    SignalStore.misc.lastSyncMessageSeenTimeMs = System.currentTimeMillis()
+
     AppDependencies.messageNotifier.apply {
       cancelDelayedNotifications()
       updateNotification(context)
@@ -1073,6 +1079,8 @@ object SyncMessageProcessor {
       }
     }
 
+    SignalStore.misc.lastSyncMessageSeenTimeMs = System.currentTimeMillis()
+
     AppDependencies.messageNotifier.apply {
       cancelDelayedNotifications()
       updateNotification(context)