func (server msgServer) Mint(goCtx context.Context, msg *types.MsgMint) (*types.MsgMintResponse, error) {

...

	if msg.Sender != authorityMetadata.GetAdmin() {
		return nil, types.ErrUnauthorized
	}

	if msg.MintToAddress == "" {
		msg.MintToAddress = msg.Sender
	}

...

	ctx.EventManager().EmitEvents(sdk.Events{
		sdk.NewEvent(
			types.TypeMsgMint,
			sdk.NewAttribute(types.AttributeMintToAddress
			, msg.Sender), // <---------
			sdk.NewAttribute(types.AttributeAmount, msg.Amount.String()),
		),
	})

	return &types.MsgMintResponse{}, nil
}
diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go
index 14a8d7d..9e66247 100644
--- a/x/tokenfactory/keeper/msg_server.go
+++ b/x/tokenfactory/keeper/msg_server.go
@@ -80,7 +80,7 @@ func (server msgServer) Mint(goCtx context.Context, msg *types.MsgMint) (*types.
        ctx.EventManager().EmitEvents(sdk.Events{
                sdk.NewEvent(
                        types.TypeMsgMint,
-                       sdk.NewAttribute(types.AttributeMintToAddress, msg.Sender),
+                       sdk.NewAttribute(types.AttributeMintToAddress, msg.MintToAddress),
                        sdk.NewAttribute(types.AttributeAmount, msg.Amount.String()),
                ),
        })
(END)
