diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index 7e654f99a..4b6814fc4 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -633,7 +633,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
     func scrollToInteraction(with interactionID: String, position: UITableView.ScrollPosition = .middle, isAnimated: Bool = true, highlighted: Bool = false) {
         guard let indexPath = viewModel.ensureLoadWindowContainsInteractionId(interactionID) else { return }
         messagesTableView.scrollToRow(at: indexPath, at: position, animated: isAnimated)
-        if highlighted, let _ = messagesTableView.cellForRow(at: indexPath) as? VisibleMessageCell {
+        if highlighted {
             focusedMessageIndexPath = indexPath
         }
     }