diff --git a/packages/status-react/src/routes/chat/index.tsx b/packages/status-react/src/routes/chat/index.tsx
index 365baa93..c68ac9b6 100644
--- a/packages/status-react/src/routes/chat/index.tsx
+++ b/packages/status-react/src/routes/chat/index.tsx
@@ -59,13 +59,12 @@ const Body = () => {
     <>
       <ContentWrapper ref={contentRef}>
         <ChatStart chatId={chatId} />
-      {messages.data.map((message, index) => (
-        <ChatMessage
-          key={message.messageId}
-          message={message}
-          previousMessage={messages.data[index - 1]}
-        />
+        {messages.data.map(message => (
+          <ChatMessage key={message.messageId} message={message} />
+        ))}
       </ContentWrapper>
+      <ChatInput onSubmit={handleMessageSubmit} />
+    </>
   )
 }