diff --git a/src/pages/common/components/ChatComponent/ChatComponent.tsx b/src/pages/common/components/ChatComponent/ChatComponent.tsx
index 8bcb77ad89..918b8a7651 100644
--- a/src/pages/common/components/ChatComponent/ChatComponent.tsx
+++ b/src/pages/common/components/ChatComponent/ChatComponent.tsx
@@ -645,7 +645,7 @@ export default function ChatComponent({
           }}
           value={message}
           onChange={setMessage}
-          placeholder="What do you think?"
+          placeholder="Message"
           onKeyDown={onEnterKeyDown}
           users={users}
           shouldReinitializeEditor={shouldReinitializeEditor}
diff --git a/src/pages/common/components/ChatComponent/components/ChatContent/ChatContent.tsx b/src/pages/common/components/ChatComponent/components/ChatContent/ChatContent.tsx
index f8775030d4..17c3d6c60a 100644
--- a/src/pages/common/components/ChatComponent/components/ChatContent/ChatContent.tsx
+++ b/src/pages/common/components/ChatComponent/components/ChatContent/ChatContent.tsx
@@ -17,7 +17,7 @@ import {
   LOADER_APPEARANCE_DELAY,
   QueryParamKey,
 } from "@/shared/constants";
-import { useQueryParams } from "@/shared/hooks";
+import { useForceUpdate, useQueryParams } from "@/shared/hooks";
 import {
   checkIsUserDiscussionMessage,
   CommonFeedObjectUserUnique,
@@ -97,6 +97,13 @@ const ChatContent: ForwardRefRenderFunction<
   const userId = user?.uid;
   const queryParams = useQueryParams();
   const messageIdParam = queryParams[QueryParamKey.Message];
+  const forceUpdate = useForceUpdate();
+
+  useEffect(() => {
+    if (messages) {
+      forceUpdate();
+    }
+  }, [messages]);
 
   const [highlightedMessageId, setHighlightedMessageId] = useState(
     () => (typeof messageIdParam === "string" && messageIdParam) || null,