diff --git a/lib/Room.ts b/lib/Room.ts
index 7045977..ef25871 100644
--- a/lib/Room.ts
+++ b/lib/Room.ts
@@ -197,6 +197,8 @@ export const performHandover = async (
 		await createMessage(rid, read, modify, { text: DefaultMessage.DEFAULT_DialogflowHandoverMessage }, app);
 	}
 
+	await updateRoomCustomFields(rid, { isHandedOverFromDialogFlow: true }, read, modify);
+
 	let closeChatDesc;
 	const result = await modify
 		.getUpdater()
@@ -223,7 +225,6 @@ export const performHandover = async (
 	}
 
 	await removeBotTypingIndicator();
-	await updateRoomCustomFields(rid, { isHandedOverFromDialogFlow: true }, read, modify);
 
 	// Viasat : Start maintaining session after handover
 	const sessionMaintenanceInterval: string = await getLivechatAgentConfig(read, rid, AppSetting.DialogflowSessionMaintenanceInterval);