Janbo25, my DS2 gagged a bit, but never choked. It was quite alarming, when he gagged, but I'd watch carefully for a second, see he was breathing, and just leave him to it. Are you sure your baby is choking (which is a problem), and not just gagging (which is fine)?
If he is really choking, you need to be more careful, which is a hassle, but he will grow out of it, as long as he's given lumps.
(Even DS1, who is nearly four, periodically puts too much food in, forgets to swallow, gags, and has to spit some out in order to swallow. Very pleasant.)