Unsure how to report 2024 excess Roth-IRA contribution

I tried doing some research but Im still having some confusion on how to properly report excess IRA contributions.

Some context: I’m filing on my own using FreeTaxUSA. In 2024, I maxed out my Roth-IRA with a $7000 contribution and unfortunately made a mistake because I did not have enough earned income to make the full contribution. I realized this and was able to correct this with my bank by having them remove the excess contribution and earnings which was completed in March 2025 before the tax filing deadline in April 2025. I now have a 2025 1099-R with distribution code PJ that I received in Jan 2026.

I have a few questions on how to properly report this.

1. I tried researching on my own and found that I may need to amend my 2024 tax returns to include some of the information reported on my 1099-R? Is this correct? Should I amend the 2024 return first, before completing my 2025 taxes?

2. Additionally my current understanding is that I should be reporting this 1099-R for the 2025 tax year but I am confused with how to properly report it in the "IRA contribution" Section in the FreeTaxUSA Software.

- For the “2024 Excess IRA contributions” part, it asks “Did you have any excess IRA contributions in 2024?”, which I selected YES.

- Then it asks “Did you have excess Roth IRA contributions in 2024 reported on Form 5329, Line 24 and owe additional tax on Form 5329, Line 25?”

- was not sure how to answer this because I don’t have a Form 5329. Is the Form 5329 something I would receive after amending my 2024 taxes with the information on my 1099-R?

Thank you in advance for any and all clarifications!