Double check your steps:
Online -
- edit the 1099-R, code 7.
- select not an IRA,
- a non-qualified plan,
- none of these apply,
- done.
For the desktop version:
- Edit the 1099-R,
- select not an IRA,
- not a public safety officer,
- choose the state,
- if you select a state
- select federal government retirement benefits,
- select non-qualified plan
- done
- If you do not select a state
- choose from a non-qualified plan
- Done
The 1099-R is still under investigation. Meanwhile, I saw a workaround here for the RMD issue.

**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"