This is the IRS website for substitute 1099-Rs IRS 1099-R Substitute . If you scroll down to Table 1. A code 8 is for 2020 and a code P is for 2019. Your reasoning was sound, but P is the correct thing to post.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
