diff --git a/pallets/axelar-router/src/lib.rs b/pallets/axelar-router/src/lib.rs
index fe39a19246..838aa84bf8 100644
--- a/pallets/axelar-router/src/lib.rs
+++ b/pallets/axelar-router/src/lib.rs
@@ -293,7 +293,7 @@ pub mod pallet {
 
 			match config.domain {
 				DomainConfig::Evm(evm_config) => {
-					let sender_evm_address = H160::from_slice(&origin.address());
+					let sender_evm_address = H160::from_slice(&origin.address()[0..20]);
 
 					let message = wrap_into_axelar_msg(
 						message,
diff --git a/runtime/common/src/routing.rs b/runtime/common/src/routing.rs
index 3d51af081a..e3c13303ec 100644
--- a/runtime/common/src/routing.rs
+++ b/runtime/common/src/routing.rs
@@ -1,3 +1,4 @@
+use cfg_primitives::AccountId;
 use cfg_traits::liquidity_pools::{MessageSender, RouterSupport};
 use cfg_types::domain_address::{Domain, DomainAddress};
 use frame_support::dispatch::DispatchResultWithPostInfo;
@@ -7,6 +8,7 @@ use sp_std::marker::PhantomData;
 /// Identification of the router where the message is sent and received
 /// RouterId is more specific than Domain, because RouterId also identify by
 /// where the message is sent/received
+#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
 pub enum RouterId {
 	/// The message must be sent/received by EVM using Axelar
 	Axelar(AxelarId),