Add end condition response on client side