diff --git a/backend/src/controllers/WhatsAppController.ts b/backend/src/controllers/WhatsAppController.ts
index 0158748..1a82021 100644
--- a/backend/src/controllers/WhatsAppController.ts
+++ b/backend/src/controllers/WhatsAppController.ts
@@ -377,9 +377,11 @@ export const store = async (req: Request, res: Response): Promise<Response> => {
   } else if (!isOfficial) {
     phoneNumberId = "";
     wabaId = "";
-    number = "";
+    //number = "";
+  }
+  if(!number){
+    number = getNumberFromName(name)
   }
-
   let invalidPhoneName = validatePhoneName(name);
 
   if (invalidPhoneName) {
@@ -479,9 +481,11 @@ export const update = async (
   } else if (!isOfficial) {
     whatsappData.phoneNumberId = "";
     whatsappData.wabaId = "";
-    whatsappData.number = "";
+    //whatsappData.number = "";
+  }
+  if(!whatsappData?.number){
+    whatsappData.number = getNumberFromName(whatsappData.name)
   }
-
   const { whatsapp, oldDefaultWhatsapp } = await UpdateWhatsAppService({
     whatsappData,
     whatsappId
diff --git a/backend/src/helpers/controllByNumber.ts b/backend/src/helpers/controllByNumber.ts
index e202f6f..6ffad64 100644
--- a/backend/src/helpers/controllByNumber.ts
+++ b/backend/src/helpers/controllByNumber.ts
@@ -13,43 +13,44 @@ async function controllByNumber() {
   let controll: any[] = [];
 
   for (const ticket of tickets) {
-    let match = ticket.match(/"whatsappId":(\d+)/);
+    let match = ticket?.match(/"whatsappId":(\d+)/);
     let whatsappId = match ? match[1] : null;
 
     const whatsapp = await get({
       key: `whatsapp:${whatsappId}`
     });
 
-    match = whatsapp.match(/"number":"(\d+)"/);
+    match = whatsapp?.match(/"number":"(\d+)"/);
     let number = match ? match[1] : null;
 
-    match = ticket.match(/"id":(\d+)/);
+    match = ticket?.match(/"id":(\d+)/);
     let ticketId = match ? match[1] : null;
 
     number = JSON.parse(number);
     ticketId = JSON.parse(ticketId);
 
-    const index = controll.findIndex((c: any) => c.number == number);
+    const index = controll?.findIndex((c: any) => c.number == number);
 
     if (index == -1) {
-      controll.push({ ticketId, number });
+      controll?.push({ ticketId, number });
     }
   }
 
-  const ticketIds = controll.map((c: any) => c.ticketId);
+  const ticketIds = controll?.map((c: any) => c.ticketId);
 
-  console.log("=======> ticketIds: ", ticketIds);
+  //console.log("=======> ticketIds: ", ticketIds);
 
   for (const ticketId of ticketIds) {
     const ticket: any = await Ticket.findByPk(ticketId);
+    if(ticket){
+      const { status } = ticket;
 
-    const { status } = ticket;
-
-    if (status == "pending") {
-      await UpdateTicketService({
-        ticketData: { statusChatEnd: uuidv4() },
-        ticketId: ticket.id
-      });
+      if (status && status == "pending") {
+        await UpdateTicketService({
+          ticketData: { statusChatEnd: uuidv4() },
+          ticketId: ticket.id
+        });
+      }
     }
   }
 
diff --git a/frontend/src/components/MessageInput/index.js b/frontend/src/components/MessageInput/index.js
index 9f0b895..f20b25a 100644
--- a/frontend/src/components/MessageInput/index.js
+++ b/frontend/src/components/MessageInput/index.js
@@ -247,7 +247,7 @@ const MessageInput = ({ ticketStatus, ticketLastMessage, ticketIsRemote }) => {
       setInputMessage(ticketLastMessage)
     }
     else {
-      setInputMessage("")
+      //setInputMessage("")
     }
   }, [countTicketMsg, ticketIsRemote, ticketLastMessage])