diff --git a/src/components/MessageList/MessageList.tsx b/src/components/MessageList/MessageList.tsx
index 6baba647b..21a9fcd88 100644
--- a/src/components/MessageList/MessageList.tsx
+++ b/src/components/MessageList/MessageList.tsx
@@ -221,11 +221,13 @@ const MessageListWithContext = <
   }, [highlightedMessageId]);
 
   const showEmptyStateIndicator = elements.length === 0 && !threadList;
-
+  const dialogManagerId = threadList
+    ? 'message-list-dialog-manager-thread'
+    : 'message-list-dialog-manager';
   return (
     <MessageListContextProvider value={{ listElement, scrollToBottom }}>
       <MessageListMainPanel>
-        <DialogManagerProvider id='message-list-dialog-manager'>
+        <DialogManagerProvider id={dialogManagerId}>
           {!threadList && showUnreadMessagesNotification && (
             <UnreadMessagesNotification unreadCount={channelUnreadUiState?.unread_messages} />
           )}
diff --git a/src/components/MessageList/VirtualizedMessageList.tsx b/src/components/MessageList/VirtualizedMessageList.tsx
index 34aafe490..897819525 100644
--- a/src/components/MessageList/VirtualizedMessageList.tsx
+++ b/src/components/MessageList/VirtualizedMessageList.tsx
@@ -434,10 +434,14 @@ const VirtualizedMessageListWithContext = <
 
   if (!processedMessages) return null;
 
+  const dialogManagerId = threadList
+    ? 'virtualized-message-list-dialog-manager-thread'
+    : 'virtualized-message-list-dialog-manager';
+
   return (
     <>
       <MessageListMainPanel>
-        <DialogManagerProvider id='virtualized-message-list-dialog-manager'>
+        <DialogManagerProvider id={dialogManagerId}>
           {!threadList && showUnreadMessagesNotification && (
             <UnreadMessagesNotification unreadCount={channelUnreadUiState?.unread_messages} />
           )}