Yes, the HOTTAP Go will turn off after you use all the water. When the water runs out, you will hear it trying to pull more water. After a few tries, it will stop. Refill it to start it up again!