diff --git a/modules/token/keeper/msg_server.go b/modules/token/keeper/msg_server.go
index e0a6ea08..dbd1f0af 100644
--- a/modules/token/keeper/msg_server.go
+++ b/modules/token/keeper/msg_server.go
@@ -311,12 +311,9 @@ func (m msgServer) SwapFromERC20(goCtx context.Context, msg *v1.MsgSwapFromERC20
 		return nil, err
 	}
 
-	receiver := sender
-	if len(msg.Receiver) > 0 {
-		receiver, err = sdk.AccAddressFromBech32(msg.Receiver)
-		if err != nil {
-			return nil, err
-		}
+	receiver, err := sdk.AccAddressFromBech32(msg.Receiver)
+	if err != nil {
+		return nil, err
 	}
 
 	if err := m.k.SwapFromERC20(ctx, common.BytesToAddress(sender.Bytes()), receiver, msg.WantedAmount); err != nil {
@@ -333,14 +330,11 @@ func (m msgServer) SwapToERC20(goCtx context.Context, msg *v1.MsgSwapToERC20) (*
 		return nil, err
 	}
 
-	receiver := common.BytesToAddress(sender.Bytes())
-	if len(msg.Receiver) > 0 {
-		bz, err := hex.DecodeString(msg.Receiver)
-		if err != nil {
-			return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "expecting a hex address of 0x, got %s", msg.Receiver)
-		}
-		receiver = common.BytesToAddress(bz)
+	bz, err := hex.DecodeString(msg.Receiver)
+	if err != nil {
+		return nil, errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "expecting a hex address of 0x, got %s", msg.Receiver)
 	}
+	receiver := common.BytesToAddress(bz)
 
 	if err := m.k.SwapToERC20(ctx, sender, receiver, msg.Amount); err != nil {
 		return nil, err
diff --git a/modules/token/types/v1/msgs.go b/modules/token/types/v1/msgs.go
index 3c5d0f94..229c45f9 100644
--- a/modules/token/types/v1/msgs.go
+++ b/modules/token/types/v1/msgs.go
@@ -395,10 +395,8 @@ func (m *MsgSwapFromERC20) ValidateBasic() error {
 		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err)
 	}
 
-	if len(m.Receiver) > 0 {
-		if _, err := sdk.AccAddressFromBech32(m.Receiver); err != nil {
-			return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err)
-		}
+	if _, err := sdk.AccAddressFromBech32(m.Receiver); err != nil {
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receiver address (%s)", err)
 	}
 
 	if !m.WantedAmount.IsValid() {
@@ -423,11 +421,9 @@ func (m *MsgSwapToERC20) ValidateBasic() error {
 		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err)
 	}
 
-	if len(m.Receiver) > 0 {
-		_, err := hex.DecodeString(m.Receiver)
-		if err != nil {
-			return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "expecting a hex address of 0x, got %s", m.Receiver)
-		}
+	_, err := hex.DecodeString(m.Receiver)
+	if err != nil {
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "expecting a hex address of 0x, got %s", m.Receiver)
 	}
 
 	if !m.Amount.IsValid() {