diff --git a/backend/src/services/MessageServices/CreateMessageService.ts b/backend/src/services/MessageServices/CreateMessageService.ts
index 857ec5c..67fd33b 100644
--- a/backend/src/services/MessageServices/CreateMessageService.ts
+++ b/backend/src/services/MessageServices/CreateMessageService.ts
@@ -27,7 +27,7 @@ const CreateMessageService = async ({
       {
         model: Ticket,
         as: "ticket",
-        include: ["contact"]
+        include: ["contact", "queue"]
       },
       {
         model: Message,
diff --git a/backend/src/services/WbotServices/wbotMessageListener.ts b/backend/src/services/WbotServices/wbotMessageListener.ts
index 5a6a968..e5303dc 100644
--- a/backend/src/services/WbotServices/wbotMessageListener.ts
+++ b/backend/src/services/WbotServices/wbotMessageListener.ts
@@ -145,12 +145,12 @@ const verifyQueue = async (
 
   const selectedOption = msg.body[0];
 
-  const validOption = queues[+selectedOption - 1];
+  const choosenQueue = queues[+selectedOption - 1];
 
-  if (validOption) {
-    await ticket.$set("queue", validOption);
+  if (choosenQueue) {
+    await ticket.$set("queue", choosenQueue);
 
-    const body = `\u200e ${validOption.greetingMessage}`;
+    const body = `\u200e ${choosenQueue.greetingMessage}`;
 
     const sentMessage = await wbot.sendMessage(`${contact.number}@c.us`, body);
 
diff --git a/backend/src/services/QueueService/AssociateWhatsappQueue.ts b/backend/src/services/WhatsappService/AssociateWhatsappQueue.ts
similarity index 100%
rename from backend/src/services/QueueService/AssociateWhatsappQueue.ts
rename to backend/src/services/WhatsappService/AssociateWhatsappQueue.ts
diff --git a/backend/src/services/WhatsappService/CreateWhatsAppService.ts b/backend/src/services/WhatsappService/CreateWhatsAppService.ts
index b2ced1e..f653d49 100644
--- a/backend/src/services/WhatsappService/CreateWhatsAppService.ts
+++ b/backend/src/services/WhatsappService/CreateWhatsAppService.ts
@@ -2,7 +2,7 @@ import * as Yup from "yup";
 
 import AppError from "../../errors/AppError";
 import Whatsapp from "../../models/Whatsapp";
-import AssociateWhatsappQueue from "../QueueService/AssociateWhatsappQueue";
+import AssociateWhatsappQueue from "./AssociateWhatsappQueue";
 
 interface Request {
   name: string;
diff --git a/backend/src/services/WhatsappService/UpdateWhatsAppService.ts b/backend/src/services/WhatsappService/UpdateWhatsAppService.ts
index d7a155c..4d96889 100644
--- a/backend/src/services/WhatsappService/UpdateWhatsAppService.ts
+++ b/backend/src/services/WhatsappService/UpdateWhatsAppService.ts
@@ -4,7 +4,7 @@ import { Op } from "sequelize";
 import AppError from "../../errors/AppError";
 import Whatsapp from "../../models/Whatsapp";
 import ShowWhatsAppService from "./ShowWhatsAppService";
-import AssociateWhatsappQueue from "../QueueService/AssociateWhatsappQueue";
+import AssociateWhatsappQueue from "./AssociateWhatsappQueue";
 
 interface WhatsappData {
   name?: string;