diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index e6e60e648..8cce3fe0a 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -569,6 +569,10 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers
         let threadId: String = viewModel.threadData.threadId
         
         if
+            (
+                self.navigationController == nil ||
+                self.navigationController?.viewControllers.contains(self) == false
+            ) &&
             viewModel.threadData.threadIsNoteToSelf == false &&
             viewModel.threadData.threadShouldBeVisible == false &&
             !SessionUtil.conversationInConfig(