No clearing of status after handling chainging

Change-Id: I421fcf3d015026c3e06a99c4a726bbc2f2111296