Hi,
Thanks for reporting.
Sorry but I could not repro in the incoming 5.5.1. By creating the shader itself with substrate enable or even after conversion. Maybe there is another case failing I have not encountered. Hard to tell without a project or material.
Or it got fixed when I fixed the shading model issues reported above (missing some data and missing unlit ID/Color, that is fixed now).