Excess Roth Contributions

I found out that I made ineligible 2020 Roth contributions because I had no earned income. I requested Vanguard to remove the excess and earnings on February 2021. I will be getting a 2021 1099-R showing this removal and will not receive it until next year in 2022. Instead of waiting for my 2021 1099-R, I followed these instructions to report it on my 2020 return.

 

I indicated to TurboTax that the year on my 1099-R is 2021. Do I also indicate that this is a substitute 1099-R since I won't be receiving the form until next year?