diff --git a/packages/botonic-api/src/rest/routes/events.ts b/packages/botonic-api/src/rest/routes/events.ts
index 186f23f161..c5a0a70c2a 100644
--- a/packages/botonic-api/src/rest/routes/events.ts
+++ b/packages/botonic-api/src/rest/routes/events.ts
@@ -93,7 +93,7 @@ export default function eventsRouter(args: any): Router {
           })
           await handlers.run('botExecutor', {
             input: { ...message, userId }, // To identify user executing the input
-            session: updatedUser.session,
+            session: user.session,
             botState: user.botState,
             websocketId: user.websocketId,
           })
diff --git a/packages/botonic-core/src/handoff.ts b/packages/botonic-core/src/handoff.ts
index 81e35ee73b..acc2886408 100644
--- a/packages/botonic-core/src/handoff.ts
+++ b/packages/botonic-core/src/handoff.ts
@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 import { PATH_PAYLOAD_IDENTIFIER } from './constants'
-import { Session } from './models'
+import { BotState, Session } from './models'
 
 const HUBTYPE_API_URL = 'https://api.hubtype.com'
 
@@ -257,14 +257,15 @@ export async function getAgentVacationRanges(
 }
 
 export function cancelHandoff(
-  botState: any,
+  botState: BotState,
   typification: string | null = null
 ): void {
   let action = 'discard_case'
   if (typification) action = `${action}:${JSON.stringify({ typification })}`
   botState.botonicAction = action
+  botState.isHandoff = false // TODO: Review handoff functionalities
 }
 
-export function deleteUser(botState: any): void {
+export function deleteUser(botState: BotState): void {
   botState.botonicAction = `delete_user`
 }
diff --git a/packages/create-botonic-app/dev-template/api/src/websocket/onauth.js b/packages/create-botonic-app/dev-template/api/src/websocket/onauth.js
index b55c90f3f0..84784ab8c9 100644
--- a/packages/create-botonic-app/dev-template/api/src/websocket/onauth.js
+++ b/packages/create-botonic-app/dev-template/api/src/websocket/onauth.js
@@ -8,7 +8,6 @@ const initialBotState = {
   lastRoutePath: null,
   isFirstInteraction: true,
   retries: 0,
-  locale: 'en',
   isHandoff: false,
   isShadowing: false,
 }