Can I file an amended return to remove an HSA non-medical distribution fee?

Lets say I already filed my 2018 taxes which included an HSA distribution for non-medical reasons, including the extra taxes and fees that come with it. If I was to later refund the HSA as a mistaken distribution before April 15 can I file an amended return to remove the fee and taxes that I already paid for it? We are going to be amending anyway for a different reason.