diff --git a/app/components/chat.module.scss b/app/components/chat.module.scss
index 8c4359176f0..fa3a1cf2e5c 100644
--- a/app/components/chat.module.scss
+++ b/app/components/chat.module.scss
@@ -212,6 +212,7 @@
 .chat-body {
   flex: 1;
   overflow: auto;
+  overflow-x: hidden;
   padding: 20px;
   padding-bottom: 40px;
   position: relative;
diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index 25c3be26ed5..ff0bc5b347d 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -922,7 +922,7 @@ export function Chat() {
                         }}
                       ></IconButton>
                     </div>
-                    {message.role === "user" ? (
+                    {isUser ? (
                       <Avatar avatar={config.avatar} />
                     ) : (
                       <MaskAvatar mask={session.mask} />