diff --git a/packages/localnet/src/handleOnEVMCalled.ts b/packages/localnet/src/handleOnEVMCalled.ts
index c8c8cc7..1060dd5 100644
--- a/packages/localnet/src/handleOnEVMCalled.ts
+++ b/packages/localnet/src/handleOnEVMCalled.ts
@@ -37,8 +37,8 @@ export const handleOnEVMCalled = async ({
   try {
     (deployer as NonceManager).reset();
     const context = {
-      origin: sender,
-      sender: await fungibleModuleSigner.getAddress(),
+      origin: ethers.ZeroAddress,
+      sender,
       chainID,
     };
     const zrc20 = foreignCoins.find(
diff --git a/packages/localnet/src/handleOnEVMDeposited.ts b/packages/localnet/src/handleOnEVMDeposited.ts
index 4eab1ec..2b0ea64 100644
--- a/packages/localnet/src/handleOnEVMDeposited.ts
+++ b/packages/localnet/src/handleOnEVMDeposited.ts
@@ -53,8 +53,8 @@ export const handleOnEVMDeposited = async ({
   const zrc20 = foreignCoin.zrc20_contract_address;
   try {
     const context = {
-      origin: protocolContracts.gatewayZEVM.target,
-      sender: await fungibleModuleSigner.getAddress(),
+      origin: ethers.ZeroAddress,
+      sender,
       chainID: chainID,
     };
 
diff --git a/packages/localnet/src/handleOnEVMDepositedAndCalled.ts b/packages/localnet/src/handleOnEVMDepositedAndCalled.ts
index 3d1bb79..272ab03 100644
--- a/packages/localnet/src/handleOnEVMDepositedAndCalled.ts
+++ b/packages/localnet/src/handleOnEVMDepositedAndCalled.ts
@@ -56,8 +56,8 @@ export const handleOnEVMDepositedAndCalled = async ({
   try {
     const context = {
       origin: ethers.ZeroAddress,
-      sender: sender,
-      chainID: chainID,
+      sender,
+      chainID,
     };
 
     log(