diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index ca48f26c6..7655380e3 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -63,11 +63,8 @@ interface Props {
   isBlocked: boolean;
   isOnline?: boolean;
 
-  // We don't pass this as a bool, because in future we
-  // want to forward messages from Header and will need
-  // the message ID.
-  selectedMessages: Array<string>;
   isKickedFromGroup: boolean;
+  selectionMode: boolean; // is the UI on the message selection mode or not
 
   onInviteContacts: () => void;
   onSetDisappearingMessages: (seconds: number) => void;
@@ -285,9 +282,8 @@ class ConversationHeader extends React.Component<Props> {
   }
 
   public render() {
-    const { id, isKickedFromGroup } = this.props;
+    const { id, isKickedFromGroup, selectionMode } = this.props;
     const triggerId = `conversation-header-${id}`;
-    const selectionMode = !!this.props.selectedMessages.length;
 
     return (
       <div className="module-conversation-header">
diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx
index add5eb400..83266724c 100644
--- a/ts/components/session/conversation/SessionConversation.tsx
+++ b/ts/components/session/conversation/SessionConversation.tsx
@@ -208,8 +208,9 @@ export class SessionConversation extends React.Component<Props, State> {
       showOptionsPane,
       quotedMessageProps,
       lightBoxOptions,
+      selectedMessages,
     } = this.state;
-    const selectionMode = !!this.state.selectedMessages.length;
+    const selectionMode = !!selectedMessages.length;
 
     const conversation = this.props.conversations.conversationLookup[
       conversationKey
@@ -402,7 +403,7 @@ export class SessionConversation extends React.Component<Props, State> {
   }
 
   public getHeaderProps() {
-    const { conversationKey } = this.state;
+    const { conversationKey, selectedMessages } = this.state;
     const conversation = window.ConversationController.getOrThrow(
       conversationKey
     );
@@ -434,7 +435,7 @@ export class SessionConversation extends React.Component<Props, State> {
       ),
       members,
       subscriberCount: conversation.get('subscriberCount'),
-      selectedMessages: this.state.selectedMessages,
+      selectedMessages: this.state.selectedMessages?.length,
       isKickedFromGroup: conversation.get('isKickedFromGroup'),
       expirationSettingName,
       showBackButton: Boolean(this.state.infoViewState),
@@ -443,6 +444,7 @@ export class SessionConversation extends React.Component<Props, State> {
         value: item.get('seconds'),
       })),
       hasNickname: !!conversation.getNickname(),
+      selectionMode: !!selectedMessages.length,
 
       onSetDisappearingMessages: (seconds: any) =>
         conversation.updateExpirationTimer(seconds),