I have own nothing but Rowenta since I start quilting in the early 80s. Never had rust come out. I never emptied the tank but normally is was emptied anyway from all the ironing. I would certainly call customer support to see what they can tell you. You might have to start using a spray bottle instead of putting water in the tank.