diff --git a/src/frontend/src/modals/chatModal/chatInput/index.tsx b/src/frontend/src/modals/chatModal/chatInput/index.tsx
index 0af622173..a05ef1ef3 100644
--- a/src/frontend/src/modals/chatModal/chatInput/index.tsx
+++ b/src/frontend/src/modals/chatModal/chatInput/index.tsx
@@ -24,16 +24,14 @@ export default function ChatInput({
 				}}
 				ref={inputRef}
 				disabled={lockChat}
-				style={{minHeight: "40px", maxHeight: "100px", resize: "none" }}
+				style={{resize: "none" }}
 				value={lockChat ? "Thinking..." : chatValue}
-				onChange={(e) => {
-					inputRef.current.style.height = "auto";
-					inputRef.current.style.height = inputRef.current.scrollHeight + "px";
+				onChange={(e) => {							
 					setChatValue(e.target.value);
 				}}
 				className={classNames(
 					lockChat ? "bg-gray-500 text-white" : "dark:bg-gray-700",
-					"form-input block w-full  custom-scroll rounded-md border-gray-300 dark:border-gray-600  dark:text-white pr-10 sm:text-sm"
+					"form-input block w-full  custom-scroll h-10 rounded-md border-gray-300 dark:border-gray-600  dark:text-white pr-10 sm:text-sm"
 				)}
 				placeholder={"Send a message..."}
 			/>
diff --git a/src/frontend/src/modals/chatModal/chatMessage/index.tsx b/src/frontend/src/modals/chatModal/chatMessage/index.tsx
index 705f15de2..113c14f11 100644
--- a/src/frontend/src/modals/chatModal/chatMessage/index.tsx
+++ b/src/frontend/src/modals/chatModal/chatMessage/index.tsx
@@ -53,9 +53,9 @@ export default function ChatMessage({ chat }: { chat: ChatMessageType }) {
 								{chat.message}
 								{chat.files && (
 									<div className="my-2 w-full">
-										{chat.files.map((file) => {
+										{chat.files.map((file,index) => {
 											return (
-												<div className="my-2 w-full">
+												<div key={index} className="my-2 w-full">
 													<FileCard
 														fileName={"File"}
 														fileType={file.type}