I used to have this issue all the time. Since adding the Tail Sweep Pro, I haven't seen it shoot water at all. The tail no longer lifts above the water, and even if it did, I don't think it would shoot out because there is a deflector / diffuser. The tail sweeping action seems about the same.