diff --git a/frontend/src/components/chat/ChatMessageList.jsx b/frontend/src/components/chat/ChatMessageList.jsx
index 545a9f8..e47b3cf 100644
--- a/frontend/src/components/chat/ChatMessageList.jsx
+++ b/frontend/src/components/chat/ChatMessageList.jsx
@@ -52,8 +52,8 @@ const ChatMessageList = ({
         const messageUserId = message.userId ?? message.user_id;
         const isOwnMessage = messageUserId === currentUserId;
 
-        // Get user and participant data from caches
-        const user = userCache[messageUserId];
+        // Get user and participant data from caches or message object
+        const user = userCache[messageUserId] || message.user;
         const participant = participantCache[messageUserId];
 
         return (