Fix potential token update lock