diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 3afc76e9f..0ca5922fe 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -3498,6 +3498,10 @@ function showConversation({
     const { conversations } = getState();
 
     if (conversationId === conversations.selectedConversationId) {
+      if (conversationId && messageId) {
+        scrollToMessage(conversationId, messageId)(dispatch, getState, null);
+      }
+
       return;
     }