diff --git a/src/components/Chat/ChatDirect.tsx b/src/components/Chat/ChatDirect.tsx
index 848c12a..a12952d 100644
--- a/src/components/Chat/ChatDirect.tsx
+++ b/src/components/Chat/ChatDirect.tsx
@@ -251,7 +251,7 @@ const sendChatDirect = async ({ chatReference = undefined, messageText, otherDat
         otherData,
         publicKeyOfRecipient,
         address: directTo,
-      })
+      }, 120000)
         .then(async (response) => {
           if (!response?.error) {
             if (isNewChatVar) {
@@ -342,7 +342,7 @@ const clearEditorContent = () => {
           repliedTo
         }
         const sendMessageFunc = async () => {
-          await sendChatDirect({ chatReference: undefined, messageText: htmlContent, otherData}, selectedDirect?.address, publicKeyOfRecipient, false)
+          return await sendChatDirect({ chatReference: undefined, messageText: htmlContent, otherData}, selectedDirect?.address, publicKeyOfRecipient, false)
         };
 
         
diff --git a/src/components/Chat/ChatGroup.tsx b/src/components/Chat/ChatGroup.tsx
index d6c583b..7f904d8 100644
--- a/src/components/Chat/ChatGroup.tsx
+++ b/src/components/Chat/ChatGroup.tsx
@@ -496,7 +496,7 @@ const sendChatGroup = async ({groupId, typeMessage = undefined, chatReference =
         typeMessage,
         chatReference,
         messageText,
-      })
+      }, 120000)
         .then((response) => {
           if (!response?.error) {
             res(response);
@@ -562,7 +562,7 @@ const clearEditorContent = () => {
         // const res = await sendChatGroup({groupId: selectedGroup,messageText: encryptSingle})
        
         const sendMessageFunc = async () => {
-          await sendChatGroup({groupId: selectedGroup,messageText: encryptSingle})
+         return await sendChatGroup({groupId: selectedGroup,messageText: encryptSingle})
         };
   
         // Add the function to the queue
@@ -641,7 +641,7 @@ const clearEditorContent = () => {
       // const res = await sendChatGroup({groupId: selectedGroup,messageText: encryptSingle})
      
       const sendMessageFunc = async () => {
-        await sendChatGroup({groupId: selectedGroup,messageText: encryptSingle, chatReference: chatMessage.signature})
+       return await sendChatGroup({groupId: selectedGroup,messageText: encryptSingle, chatReference: chatMessage.signature})
       };
 
       // Add the function to the queue
diff --git a/src/messaging/messagesToBackground.tsx b/src/messaging/messagesToBackground.tsx
index f64665f..25140a7 100644
--- a/src/messaging/messagesToBackground.tsx
+++ b/src/messaging/messagesToBackground.tsx
@@ -24,7 +24,7 @@ window.addEventListener("message", (event) => {
   }
 });
 
-export const sendMessageBackground = (action, data = {}, timeout = 60000, isExtension, appInfo) => {
+export const sendMessageBackground = (action, data = {}, timeout = 120000, isExtension, appInfo) => {
   return new Promise((resolve, reject) => {
     const requestId = generateRequestId(); // Unique ID for each request
     callbackMap.set(requestId, { resolve, reject }); // Store both resolve and reject callbacks