Just signed into the forum today and read your post. I love the ego T but had the same problem with leaking. The solution I found was a silicon replacement cap for the tank. I have vaped using the same tank now for around 3 weeks leak free. I also never remove the cap. I use a needle top bottle or syringe to fill with. Forum will not let me post site where I purchased them.