diff --git a/src/api/integrations/chatbot/dify/controllers/dify.controller.ts b/src/api/integrations/chatbot/dify/controllers/dify.controller.ts
index 41e6982a..440b24f0 100644
--- a/src/api/integrations/chatbot/dify/controllers/dify.controller.ts
+++ b/src/api/integrations/chatbot/dify/controllers/dify.controller.ts
@@ -7,6 +7,7 @@ import { WAMonitoringService } from '@api/services/monitor.service';
 import { configService, Dify } from '@config/env.config';
 import { Logger } from '@config/logger.config';
 import { BadRequestException } from '@exceptions';
+import { Dify as DifyModel } from '@prisma/client';
 import { getConversationMessage } from '@utils/getConversationMessage';
 
 import { ChatbotController, ChatbotControllerInterface, EmitData } from '../../chatbot.controller';
@@ -723,49 +724,25 @@ export class DifyController extends ChatbotController implements ChatbotControll
 
       const content = getConversationMessage(msg);
 
-      const findBot = await this.findBotTrigger(
+      const findBot = (await this.findBotTrigger(
         this.botRepository,
         this.settingsRepository,
         content,
         instance,
         session,
-      );
+      )) as DifyModel;
 
       if (!findBot) return;
 
-      let expire = findBot.expire;
-      let keywordFinish = findBot.keywordFinish;
-      let delayMessage = findBot.delayMessage;
-      let unknownMessage = findBot.unknownMessage;
       let listeningFromMe = findBot.listeningFromMe;
       let stopBotFromMe = findBot.stopBotFromMe;
-      let keepOpen = findBot.keepOpen;
       let debounceTime = findBot.debounceTime;
 
-      if (
-        !expire ||
-        !keywordFinish ||
-        !delayMessage ||
-        !unknownMessage ||
-        !listeningFromMe ||
-        !stopBotFromMe ||
-        !keepOpen ||
-        !debounceTime
-      ) {
-        if (!expire) expire = settings.expire;
-
-        if (!keywordFinish) keywordFinish = settings.keywordFinish;
-
-        if (!delayMessage) delayMessage = settings.delayMessage;
-
-        if (!unknownMessage) unknownMessage = settings.unknownMessage;
-
+      if (!listeningFromMe || !stopBotFromMe || !debounceTime) {
         if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
 
         if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
 
-        if (!keepOpen) keepOpen = settings.keepOpen;
-
         if (!debounceTime) debounceTime = settings.debounceTime;
       }
 
diff --git a/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts b/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts
index 2ee932d8..58c80114 100644
--- a/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts
+++ b/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts
@@ -8,6 +8,7 @@ import { getConversationMessage } from '@utils/getConversationMessage';
 import { ChatbotController, ChatbotControllerInterface, EmitData } from '../../chatbot.controller';
 import { FlowiseDto } from '../dto/flowise.dto';
 import { FlowiseService } from '../services/flowise.service';
+import { Flowise } from '@prisma/client';
 
 export class FlowiseController extends ChatbotController implements ChatbotControllerInterface {
   constructor(
@@ -695,49 +696,25 @@ export class FlowiseController extends ChatbotController implements ChatbotContr
 
       const content = getConversationMessage(msg);
 
-      const findBot = await this.findBotTrigger(
+      const findBot = (await this.findBotTrigger(
         this.botRepository,
         this.settingsRepository,
         content,
         instance,
         session,
-      );
+      )) as Flowise;
 
       if (!findBot) return;
 
-      let expire = findBot.expire;
-      let keywordFinish = findBot.keywordFinish;
-      let delayMessage = findBot.delayMessage;
-      let unknownMessage = findBot.unknownMessage;
       let listeningFromMe = findBot.listeningFromMe;
       let stopBotFromMe = findBot.stopBotFromMe;
-      let keepOpen = findBot.keepOpen;
       let debounceTime = findBot.debounceTime;
 
-      if (
-        !expire ||
-        !keywordFinish ||
-        !delayMessage ||
-        !unknownMessage ||
-        !listeningFromMe ||
-        !stopBotFromMe ||
-        !keepOpen ||
-        !debounceTime
-      ) {
-        if (!expire) expire = settings.expire;
-
-        if (!keywordFinish) keywordFinish = settings.keywordFinish;
-
-        if (!delayMessage) delayMessage = settings.delayMessage;
-
-        if (!unknownMessage) unknownMessage = settings.unknownMessage;
-
+      if (!listeningFromMe || !stopBotFromMe || !debounceTime) {
         if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
 
         if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
 
-        if (!keepOpen) keepOpen = settings.keepOpen;
-
         if (!debounceTime) debounceTime = settings.debounceTime;
       }
 
diff --git a/src/api/integrations/chatbot/generic/controllers/generic.controller.ts b/src/api/integrations/chatbot/generic/controllers/generic.controller.ts
index a5c7a9a6..7d887b2d 100644
--- a/src/api/integrations/chatbot/generic/controllers/generic.controller.ts
+++ b/src/api/integrations/chatbot/generic/controllers/generic.controller.ts
@@ -3,6 +3,7 @@ import { InstanceDto } from '@api/dto/instance.dto';
 import { PrismaRepository } from '@api/repository/repository.service';
 import { WAMonitoringService } from '@api/services/monitor.service';
 import { Logger } from '@config/logger.config';
+import { GenericBot } from '@prisma/client';
 import { getConversationMessage } from '@utils/getConversationMessage';
 
 import { ChatbotController, ChatbotControllerInterface, EmitData } from '../../chatbot.controller';
@@ -695,49 +696,25 @@ export class GenericController extends ChatbotController implements ChatbotContr
 
       const content = getConversationMessage(msg);
 
-      const findBot = await this.findBotTrigger(
+      const findBot = (await this.findBotTrigger(
         this.botRepository,
         this.settingsRepository,
         content,
         instance,
         session,
-      );
+      )) as GenericBot;
 
       if (!findBot) return;
 
-      let expire = findBot.expire;
-      let keywordFinish = findBot.keywordFinish;
-      let delayMessage = findBot.delayMessage;
-      let unknownMessage = findBot.unknownMessage;
       let listeningFromMe = findBot.listeningFromMe;
       let stopBotFromMe = findBot.stopBotFromMe;
-      let keepOpen = findBot.keepOpen;
       let debounceTime = findBot.debounceTime;
 
-      if (
-        !expire ||
-        !keywordFinish ||
-        !delayMessage ||
-        !unknownMessage ||
-        !listeningFromMe ||
-        !stopBotFromMe ||
-        !keepOpen ||
-        !debounceTime
-      ) {
-        if (!expire) expire = settings.expire;
-
-        if (!keywordFinish) keywordFinish = settings.keywordFinish;
-
-        if (!delayMessage) delayMessage = settings.delayMessage;
-
-        if (!unknownMessage) unknownMessage = settings.unknownMessage;
-
+      if (!listeningFromMe || !stopBotFromMe || !debounceTime) {
         if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
 
         if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
 
-        if (!keepOpen) keepOpen = settings.keepOpen;
-
         if (!debounceTime) debounceTime = settings.debounceTime;
       }
 
diff --git a/src/api/integrations/chatbot/openai/controllers/openai.controller.ts b/src/api/integrations/chatbot/openai/controllers/openai.controller.ts
index 6e54618a..6bcd9531 100644
--- a/src/api/integrations/chatbot/openai/controllers/openai.controller.ts
+++ b/src/api/integrations/chatbot/openai/controllers/openai.controller.ts
@@ -7,6 +7,7 @@ import { WAMonitoringService } from '@api/services/monitor.service';
 import { configService, Openai } from '@config/env.config';
 import { Logger } from '@config/logger.config';
 import { BadRequestException } from '@exceptions';
+import { OpenaiBot } from '@prisma/client';
 import { getConversationMessage } from '@utils/getConversationMessage';
 import OpenAI from 'openai';
 
@@ -941,54 +942,26 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
 
       const content = getConversationMessage(msg);
 
-      const findBot = await this.findBotTrigger(
+      const findBot = (await this.findBotTrigger(
         this.botRepository,
         this.settingsRepository,
         content,
         instance,
         session,
-      );
+      )) as OpenaiBot;
 
       if (!findBot) return;
 
       // verify default settings
-      let openaiCredsId = findBot.openaiCredsId;
-      let expire = findBot.expire;
-      let keywordFinish = findBot.keywordFinish;
-      let delayMessage = findBot.delayMessage;
-      let unknownMessage = findBot.unknownMessage;
       let listeningFromMe = findBot.listeningFromMe;
       let stopBotFromMe = findBot.stopBotFromMe;
-      let keepOpen = findBot.keepOpen;
       let debounceTime = findBot.debounceTime;
 
-      if (
-        !openaiCredsId ||
-        !expire ||
-        !keywordFinish ||
-        !delayMessage ||
-        !unknownMessage ||
-        !listeningFromMe ||
-        !stopBotFromMe ||
-        !keepOpen ||
-        !debounceTime
-      ) {
-        if (!openaiCredsId) openaiCredsId = settings.openaiCredsId;
-
-        if (!expire) expire = settings.expire;
-
-        if (!keywordFinish) keywordFinish = settings.keywordFinish;
-
-        if (!delayMessage) delayMessage = settings.delayMessage;
-
-        if (!unknownMessage) unknownMessage = settings.unknownMessage;
-
+      if (!listeningFromMe || !stopBotFromMe || !debounceTime) {
         if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
 
         if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
 
-        if (!keepOpen) keepOpen = settings.keepOpen;
-
         if (!debounceTime) debounceTime = settings.debounceTime;
       }
 
diff --git a/src/api/integrations/chatbot/typebot/controllers/typebot.controller.ts b/src/api/integrations/chatbot/typebot/controllers/typebot.controller.ts
index 01db49dd..7e615eec 100644
--- a/src/api/integrations/chatbot/typebot/controllers/typebot.controller.ts
+++ b/src/api/integrations/chatbot/typebot/controllers/typebot.controller.ts
@@ -12,6 +12,7 @@ import { getConversationMessage } from '@utils/getConversationMessage';
 import axios from 'axios';
 
 import { ChatbotController, ChatbotControllerInterface } from '../../chatbot.controller';
+import { Typebot as TypebotModel } from '@prisma/client';
 
 export class TypebotController extends ChatbotController implements ChatbotControllerInterface {
   constructor(
@@ -1001,13 +1002,13 @@ export class TypebotController extends ChatbotController implements ChatbotContr
 
       const content = getConversationMessage(msg);
 
-      const findBot = await this.findBotTrigger(
+      const findBot = (await this.findBotTrigger(
         this.botRepository,
         this.settingsRepository,
         content,
         instance,
         session,
-      );
+      )) as TypebotModel;
 
       if (!findBot) return;