Baker would continue to do regular voice-over roles. In 2005, he landed a role as Klaus Heisler, an Olympic ski jumper from Germany who was body-swapped into a goldfish, in the primetime cartoon sitcom "American Dad!", which has run over fifteen seasons on Fox and TBS and on DVD. In an interview with Pop Break, Baker said that he liked playing Klaus because he loves the German language, the part was well written, and it is light duty on his voice. He compared the table reads to being on "The Carol Burnett Show". He participated in "American Dad" panels at San Diego Comic-Con 2010 2012, and 2014; and the New York Comic-Con in 2014. In 2017, he received a nomination for the Primetime Emmy Award for Outstanding Character Voice-Over Performance for Klaus in the episode "Fight or Flight".