diff --git a/handler/OnAgentAssignedHandler.ts b/handler/OnAgentAssignedHandler.ts
index fbdcccf..a7e1188 100644
--- a/handler/OnAgentAssignedHandler.ts
+++ b/handler/OnAgentAssignedHandler.ts
@@ -81,7 +81,7 @@ export class OnAgentAssignedHandler {
 
 		if (sendWelcomeMessage) {
 			const disableInput: IDialogflowCustomFields = {
-				disableInput: true,
+				disableInput: disableComposerOnTriggerEvent,
 				disableInputMessage: 'Starting chat...',
 				displayTyping: true,
 			};
diff --git a/lib/payloadAction.ts b/lib/payloadAction.ts
index d6ddb69..c8e2e61 100644
--- a/lib/payloadAction.ts
+++ b/lib/payloadAction.ts
@@ -192,13 +192,14 @@ export const sendWelcomeEventToDialogFlow = async (
 	try {
 		const data = await retrieveDataByAssociation(read, getRoomAssoc(rid));
 		const defaultLanguageCode = await getLivechatAgentConfig(read, rid, AppSetting.DialogflowAgentDefaultLanguage);
+		const disableComposerOnTriggerEvent = await getLivechatAgentConfig(read, rid, AppSetting.DialogflowDisableComposerOnTriggerEvent);
 		const event = {
 			name: WELCOME_EVENT_NAME,
 			languageCode: data.custom_languageCode || defaultLanguageCode || LanguageCode.EN,
 			parameters: { ...(livechatData || {}), roomId: rid, visitorToken } || {},
 		};
 		const disableInput: IDialogflowCustomFields = {
-			disableInput: true,
+			disableInput: disableComposerOnTriggerEvent,
 			disableInputMessage: 'Starting chat...',
 			displayTyping: true,
 		};