DF#QCADOOMES-2307 fix state change