Yes, you should always wait till you receive the refund first, and then amend your tax return if necessary. The same still applies even if the 1040-X form is already available.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
