diff --git a/src/views/ChatHistory.jsx b/src/views/ChatHistory.jsx
index cf91dc6..3b9cbbd 100644
--- a/src/views/ChatHistory.jsx
+++ b/src/views/ChatHistory.jsx
@@ -153,7 +153,7 @@ function ChatHistory() {
     if (isEmpty(selectedConversation.conversationid)) {
       return () => {};
     }
-    const firstActionPageParams = { opisn: selectedConversation.opi_sn, whatsappid: selectedConversation.whatsapp_phone_number };
+    const firstActionPageParams = { opisn: selectedConversation.OPI_SN, whatsappid: selectedConversation.whatsapp_phone_number };
     if (isEmpty(selectedConversation.matchMsgList)) {
       firstActionPageParams.loadPrePage = false;
       firstActionPageParams.loadNextPage = true;
@@ -364,7 +364,7 @@ function ChatHistory() {
                         : {})}
                       renderAddCmp={
                         <div className='border-dashed border-0 border-t border-slate-300 text-slate-600 space-x-2 emoji'>
-                          <span className={`p-1 rounded-b ${message.msg_direction === 'outbound' ? 'text-white' : ''} `} style={{backgroundColor: message.msg_direction === 'outbound' ? stringToColour(message.senderName) : 'unset'}}>{selectedConversation.OPI_Name || message.senderName}</span>
+                          <span className={`p-1 rounded-b ${message.msg_direction === 'outbound' ? 'text-white' : ''} `} style={{backgroundColor: message.msg_direction === 'outbound' ? stringToColour(message.senderName) : 'unset'}}>{message.msg_direction === 'outbound' ? selectedConversation.OPI_Name : message.senderName}</span>
                           <span>{message.dateString || message.localDate}</span>
                           <span>{message.statusCN}</span>
                         </div>