diff --git a/src/channel/bubbleMsgUtils.js b/src/channel/bubbleMsgUtils.js
index 0e8a18c..e719e83 100644
--- a/src/channel/bubbleMsgUtils.js
+++ b/src/channel/bubbleMsgUtils.js
@@ -650,7 +650,7 @@ export const parseRenderMessageItem = (msg) => {
     dateString: dayjs(msg?.sendTime || msg.createTime).format('MM-DD HH:mm'),
     from: msg.from,
     sender: msg.from,
-    senderName: msg?.customerProfile?.name || msg?.fromName || msg?.from || 'me',
+    senderName: msg.msg_direction === 'outbound' ? 'me' : msg?.customerProfile?.name || msg?.fromName || msg?.from || '',
     customer_name: msg?.customerProfile?.name || '',
     whatsapp_name: msg?.customerProfile?.name || '',
     whatsapp_phone_number: isEmpty(msg?.customerProfile) ? msg.to : msg.from,
diff --git a/src/views/Conversations/Online/Input/InputComposer.jsx b/src/views/Conversations/Online/Input/InputComposer.jsx
index 2521987..87a874c 100644
--- a/src/views/Conversations/Online/Input/InputComposer.jsx
+++ b/src/views/Conversations/Online/Input/InputComposer.jsx
@@ -267,7 +267,7 @@ const InputComposer = ({ channel, currentActive }) => {
 
   useEffect(() => {
     if (currentActive) focusInput();
-    if (!isEmpty(referenceMsg) && referenceMsg.waba !== fromIM.replace('+', '')) {
+    if (!isEmpty(referenceMsg) && referenceMsg.waba.replace('+', '') !== fromIM.replace('+', '')) {
       setWabaWarning('注意: 回复的消息与当前使用的WABA账户不一致. 请到个人资料页面切换WABA商业号身份.')
     } else {
       setWabaWarning('');