diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 985c6070bb..188442a038 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -657,11 +657,15 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         }
 
         lifecycleScope.launch {
-            viewModel.conversationReloadNotification
-                .collect {
-                    LoaderManager.getInstance(this@ConversationActivityV2)
-                        .restartLoader(0, null, this@ConversationActivityV2)
-                }
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.conversationReloadNotification
+                    .collect {
+                        if (!firstLoad.get()) {
+                            LoaderManager.getInstance(this@ConversationActivityV2)
+                                .restartLoader(0, null, this@ConversationActivityV2)
+                        }
+                    }
+            }
         }
 
         setupMentionView()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
index 52f31f66ba..1537e0c1eb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
@@ -213,7 +213,7 @@ class ConversationViewModel @AssistedInject constructor(
     val conversationReloadNotification: SharedFlow<*> = merge(
         threadIdFlow
             .filterNotNull()
-            .flatMapLatest { id ->  threadDb.updateNotifications.filter { it == id } },
+            .flatMapLatest { id -> threadDb.updateNotifications.filter { it == id } },
         recipientSettingsDatabase.changeNotification.filter { it == address },
         attachmentDatabase.changesNotification,
         reactionDb.changeNotification,