diff --git a/frontend/src/components/molecules/messages/Message.tsx b/frontend/src/components/molecules/messages/Message.tsx
index ac20f42676..4672edeaea 100644
--- a/frontend/src/components/molecules/messages/Message.tsx
+++ b/frontend/src/components/molecules/messages/Message.tsx
@@ -112,7 +112,12 @@ const Message = memo(
             >
               {/* User message is displayed differently */}
               {isUserMessage ? (
-                <Box display="flex" flexDirection="column" flexGrow={1}>
+                <Box
+                  display="flex"
+                  flexDirection="column"
+                  flexGrow={1}
+                  maxWidth={'100%'}
+                >
                   <UserMessage message={message}>
                     <MessageContent
                       elements={elements}