diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx
index d0b1d0a56..1f6470edd 100644
--- a/ts/components/conversation/SessionMessagesList.tsx
+++ b/ts/components/conversation/SessionMessagesList.tsx
@@ -49,16 +49,14 @@ export const SessionMessagesList = (props: {
 
   useLayoutEffect(() => {
     const newTopMessageId = messagesProps.length
-      ? messagesProps[messagesProps.length - 1].message.props.messageId
+      ? messagesProps[messagesProps.length - 1].messageId
       : undefined;
 
     if (oldTopMessageId !== newTopMessageId && oldTopMessageId && newTopMessageId) {
       props.scrollAfterLoadMore(oldTopMessageId, 'load-more-top');
     }
 
-    const newBottomMessageId = messagesProps.length
-      ? messagesProps[0].message.props.messageId
-      : undefined;
+    const newBottomMessageId = messagesProps.length ? messagesProps[0].messageId : undefined;
 
     if (newBottomMessageId !== oldBottomMessageId && oldBottomMessageId && newBottomMessageId) {
       props.scrollAfterLoadMore(oldBottomMessageId, 'load-more-bottom');
@@ -93,7 +91,7 @@ export const SessionMessagesList = (props: {
   return (
     <IsDetailMessageViewContext.Provider value={false}>
       {messagesProps.map(messageProps => {
-        const messageId = messageProps.message.props.messageId;
+        const { messageId } = messageProps;
         const unreadIndicator = messageProps.showUnreadIndicator ? (
           <SessionLastSeenIndicator
             key={'unread-indicator'}
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 2f3e32c52..69a9f779b 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -140,15 +140,18 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector(
           ? messageTimestamp
           : undefined;
 
-      const common = { showUnreadIndicator: isFirstUnread, showDateBreak };
-      const messageIdProps = { messageId: msg.propsForMessage.id };
+      const common = {
+        showUnreadIndicator: isFirstUnread,
+        showDateBreak,
+        messageId: msg.propsForMessage.id,
+      };
 
       if (msg.propsForDataExtractionNotification) {
         return {
           ...common,
           message: {
             messageType: 'data-extraction',
-            props: { ...msg.propsForDataExtractionNotification, ...messageIdProps },
+            props: { ...msg.propsForDataExtractionNotification },
           },
         };
       }
@@ -158,7 +161,6 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector(
           ...common,
           message: {
             messageType: 'message-request-response',
-            props: messageIdProps,
           },
         };
       }
@@ -168,7 +170,6 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector(
           ...common,
           message: {
             messageType: 'group-invitation',
-            props: messageIdProps,
           },
         };
       }
@@ -178,7 +179,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector(
           ...common,
           message: {
             messageType: 'group-notification',
-            props: { ...msg.propsForGroupUpdateMessage, ...messageIdProps },
+            props: { ...msg.propsForGroupUpdateMessage },
           },
         };
       }
@@ -188,7 +189,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector(
           ...common,
           message: {
             messageType: 'timer-notification',
-            props: { ...msg.propsForTimerNotification, ...messageIdProps },
+            props: { ...msg.propsForTimerNotification },
           },
         };
       }
@@ -200,7 +201,6 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector(
             messageType: 'call-notification',
             props: {
               ...msg.propsForCallNotification,
-              ...messageIdProps,
             },
           },
         };
@@ -213,18 +213,15 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector(
             messageType: 'interaction-notification',
             props: {
               ...msg.propsForInteractionNotification,
-              ...messageIdProps,
             },
           },
         };
       }
 
       return {
-        showUnreadIndicator: isFirstUnread,
-        showDateBreak,
+        ...common,
         message: {
           messageType: 'regular-message',
-          props: messageIdProps,
         },
       };
     });