Fix endponint service subscription