CIVI-23 Fixed no state error