[Issue 9624] Issues in client state tracking