diff --git a/frontend/src/components/MessageList.tsx b/frontend/src/components/MessageList.tsx
index b1f76fa..8e3a43d 100644
--- a/frontend/src/components/MessageList.tsx
+++ b/frontend/src/components/MessageList.tsx
@@ -43,14 +43,16 @@ export const MessageList: FC<MessageListProps> = ({ roomId }) => {
   }
 
   return (
-    <ScrollArea className="flex-1 p-4">
-      <div className="space-y-4">
-        {roomMessages.map((message: Message) => (
-          <MessageCard key={message.id} message={message} />
-        ))}
-        <div ref={messagesEndRef} />
-        <TypingIndicator roomId={roomId} />
-      </div>
-    </ScrollArea>
+    <div className="flex-1 overflow-hidden">
+      <ScrollArea className="h-full">
+        <div className="space-y-4 p-4">
+          {roomMessages.map((message: Message) => (
+            <MessageCard key={message.id} message={message} />
+          ))}
+          <div ref={messagesEndRef} />
+          <TypingIndicator roomId={roomId} />
+        </div>
+      </ScrollArea>
+    </div>
   );
-};
+};
\ No newline at end of file