diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index 16b598b49..90e06b1f0 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -361,8 +361,7 @@ final class ConversationVC: BaseVC, ConversationSearchControllerDelegate, UITabl
         // nav will be offset incorrectly during the push animation (unfortunately the profile icon still
         // doesn't appear until after the animation, I assume it's taking a snapshot or something, but
         // there isn't much we can do about that unfortunately)
-        let isNoteToSelf: Bool = self.viewModel.threadData.threadId == getUserHexEncodedPublicKey()
-        updateNavBarButtons(threadData: nil, initialVariant: self.viewModel.initialThreadVariant, isNoteToSelf: isNoteToSelf)
+        updateNavBarButtons(threadData: nil, initialVariant: self.viewModel.initialThreadVariant, isNoteToSelf: self.viewModel.threadData.threadIsNoteToSelf)
         titleView.initialSetup(with: self.viewModel.initialThreadVariant)
         
         // Constraints
diff --git a/Session/Conversations/ConversationViewModel.swift b/Session/Conversations/ConversationViewModel.swift
index 010865127..ed30ba960 100644
--- a/Session/Conversations/ConversationViewModel.swift
+++ b/Session/Conversations/ConversationViewModel.swift
@@ -104,6 +104,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
     public private(set) lazy var threadData: SessionThreadViewModel = SessionThreadViewModel(
         threadId: self.threadId,
         threadVariant: self.initialThreadVariant,
+        threadIsNoteToSelf: (self.threadId == getUserHexEncodedPublicKey()),
         currentUserIsClosedGroupMember: (self.initialThreadVariant != .closedGroup ?
             nil :
             Storage.shared.read { db in