diff --git a/src/actions/ConversationActions.js b/src/actions/ConversationActions.js
index b3744c3..e12a4c6 100644
--- a/src/actions/ConversationActions.js
+++ b/src/actions/ConversationActions.js
@@ -35,7 +35,7 @@ export const fetchOrderConversationsList = async (params) => {
   return list;
 };
 
-export const MESSAGE_PAGE_SIZE = 100;
+export const MESSAGE_PAGE_SIZE = 50;
 /**
  *
  * @param {object} params { opisn, whatsappid, lasttime, pagesize }
diff --git a/src/views/Conversations/Components/ConversationsList.jsx b/src/views/Conversations/Components/ConversationsList.jsx
index 7e1af6d..675653d 100644
--- a/src/views/Conversations/Components/ConversationsList.jsx
+++ b/src/views/Conversations/Components/ConversationsList.jsx
@@ -82,7 +82,7 @@ const Conversations = () => {
 
   useEffect(() => {
     const messagesList = activeConversations[`${currentConversation.sn}`] || [];
-    if (messagesList.length < 20) {
+    if (currentConversation.sn && messagesList.length < 20) {
       getMessages(currentConversation);
     }