I never heard of limiting anyone or anything to the amount they can drink!? I give my chi all that she wants. She'll learn to drink without choking, but until then, I would keep an eye on her & after she drinks, I would immediately take her outside to use the bathroom. She'll get the idea. It's too dangerous to limit her water intake because there's going to be times when she requires more water than others & how are you to know when that is!? If you feel this choking thing is a life-threatening situation, have her checked out by a vet, but I just think she's drinking too fast. She'll learn to slow down so she don't choke. Chi's (dogs in general) are really smart and can be taught a routine. Don't underestimate their intelligence.