diff --git a/src/lib/msgUtils.js b/src/lib/msgUtils.js
index a40a1cf..cf9a2db 100644
--- a/src/lib/msgUtils.js
+++ b/src/lib/msgUtils.js
@@ -489,6 +489,7 @@ export const parseRenderMessageItem = (msg) => {
     whatsapp_msg_type: msg.type,
     statusCN: msgStatusRenderMappedCN[msg?.status || 'failed'],
     statusTitle: msgStatusRenderMappedCN[msg?.status || 'failed'],
+    replyButton: ['text', 'document', 'image'].includes(msg.type) && (msg?.status || '') !== 'failed',
     ...((isEmpty(msg.context) && isEmpty(msg.reaction)) || msg.context?.forwarded === true // || isEmpty(msg.messageorigin)
       ? {}
       : {
@@ -533,6 +534,7 @@ export const parseRenderMessageList = (messages) => {
       from: msgContent.from,
       sender: msgContent.from,
       senderName: msgContent?.customerProfile?.name || msgContent.from,
+      replyButton: ['text', 'document', 'image'].includes(msgContent.type) && (msgContent?.status || '') !== 'failed',
       ...(msg.msg_direction === 'outbound'
         ? {
             sender: 'me',
diff --git a/src/views/ChatHistory.jsx b/src/views/ChatHistory.jsx
index 1eef08b..45820a5 100644
--- a/src/views/ChatHistory.jsx
+++ b/src/views/ChatHistory.jsx
@@ -367,6 +367,7 @@ function ChatHistory() {
                     {...message}
                     // position={message.sender === 'me' ? 'right' : 'left'}
                     position={'left'}
+                    replyButton={false}
                     onReplyMessageClick={() => scrollToMessage(message.reply.id)}
                     onOpen={() => handlePreview(message)}
                     onTitleClick={() => handlePreview(message)}
diff --git a/src/views/Conversations/Components/MessagesList.jsx b/src/views/Conversations/Components/MessagesList.jsx
index 56b7eaa..02bfed0 100644
--- a/src/views/Conversations/Components/MessagesList.jsx
+++ b/src/views/Conversations/Components/MessagesList.jsx
@@ -152,11 +152,8 @@ const MessagesList = ({ messages, handlePreview, reference, longListLoading, get
               ? {
                   styles: { backgroundColor: '#ccd4ae' },
                   notchStyle: { fill: '#ccd4ae' },
-                  replyButton: ['text', 'document', 'image'].includes(message.whatsapp_msg_type) && message.status !== 'failed' ? true : false,
                 }
-              : {
-                  replyButton: ['text', 'document', 'image'].includes(message.whatsapp_msg_type) ? true : false,
-                })}
+              : {})}
             className={[
               'whitespace-pre-wrap',
               message.whatsapp_msg_type === 'sticker' ? 'bg-transparent' : '',