diff --git a/app/src/features/chats/ChatBody.tsx b/app/src/features/chats/ChatBody.tsx
index 3376ee3d..df7471d6 100644
--- a/app/src/features/chats/ChatBody.tsx
+++ b/app/src/features/chats/ChatBody.tsx
@@ -49,7 +49,6 @@ function ChatBody() {
 
   const { handleNextMentionMessage, mentionMessages } = useTraversalMentions();
 
-
   useEffect(() => {
     if (inView && hasNextPage && chatId) {
       const container = scrollContainerRef.current;
@@ -71,7 +70,7 @@ function ChatBody() {
   let messages = chat?.messages;
 
   if (chat?.type === "channel") {
-    messages?.filter((msg) => !msg.parentMessageId);
+    messages = messages?.filter((msg) => !msg.parentMessageId);
   }
 
   const threadMessages = activeThread
diff --git a/app/src/features/chats/ChatItem.tsx b/app/src/features/chats/ChatItem.tsx
index b1d51954..32f061d0 100644
--- a/app/src/features/chats/ChatItem.tsx
+++ b/app/src/features/chats/ChatItem.tsx
@@ -64,9 +64,10 @@ const ChatItem = ({
 }: ChatItemProps) => {
   const navigate = useNavigate();
 
-  const timestamp = lastMessage?.timestamp || "No messages";
-  const lastMessageContent =
-    RenderWithMention(lastMessage?.content!, lastMessage?._id!) || "No messages";
+  const timestamp = lastMessage?.timestamp || "No Messages Found";
+  const lastMessageContent = lastMessage?.content
+    ? RenderWithMention(lastMessage?.content!, lastMessage?._id!)
+    : "No Messages Found";
 
   const { chatId } = useParams<{ chatId: string }>();
 
diff --git a/app/src/features/chats/utils/helpers.ts b/app/src/features/chats/utils/helpers.ts
index 1308bb23..d4330b59 100644
--- a/app/src/features/chats/utils/helpers.ts
+++ b/app/src/features/chats/utils/helpers.ts
@@ -41,6 +41,16 @@ export function parseChatsToState(chatData?: any) {
       (lastMessage: any) => lastMessage.chatId === chatId
     )?.lastMessage;
 
+    let lastMessageContent = null;
+
+    if (incomingLastMessage) {
+      if (incomingLastMessage.isAppropriate) {
+        lastMessageContent = incomingLastMessage.content;
+      } else {
+        lastMessageContent = "🚫️ This message has inappropriate content.";
+      }
+    }
+
     return {
       _id: chatId,
       isSeen: isSeen,
@@ -52,9 +62,7 @@ export function parseChatsToState(chatData?: any) {
 
       lastMessage: {
         _id: incomingLastMessage?.id,
-        content: incomingLastMessage?.isAppropriate
-          ? incomingLastMessage?.content
-          : "🚫️ This message has inappropriate content.",
+        content: lastMessageContent,
         senderId: incomingLastMessage?.senderId,
         timestamp: incomingLastMessage?.timestamp,
         contentType: incomingLastMessage?.contentType