Fix regression with states

[Delivers #82111616]