diff --git a/FU.SPA/src/components/Chat.jsx b/FU.SPA/src/components/Chat.jsx
index 767e0291..14380709 100644
--- a/FU.SPA/src/components/Chat.jsx
+++ b/FU.SPA/src/components/Chat.jsx
@@ -152,7 +152,7 @@ export default function Chat({ chatId }) {
           <ChatMessage
             key={index}
             chatMessage={msg}
-            userIsSender={user?.username === msg.sender.username}
+            userIsSender={user?.username === msg.sender?.username}
           />
         ))}
       </CardContent>