diff --git a/src/components/MessageList/renderMessages.tsx b/src/components/MessageList/renderMessages.tsx
index 9d6d3fc70..85948ffe4 100644
--- a/src/components/MessageList/renderMessages.tsx
+++ b/src/components/MessageList/renderMessages.tsx
@@ -84,7 +84,7 @@ export function defaultRenderMessages<
       );
     } else if (message.type === 'system') {
       renderedMessages.push(
-        <li key={message.id || (message.created_at as string)}>
+        <li data-message-id={message.id} key={message.id || (message.created_at as string)}>
           <MessageSystem message={message} />
         </li>,
       );