in 2004, waldner took part in the olympics for the 4th time. at the olympics, he lost to ma lin in the 3rd place match. the swedish team came to the quarterfinals. waldner also reached the quarterfinal at the world cup that year. at the wttc, the team won bronze. he took part in his lat wttc in 2005. in his last wttc tournament, he reached the quarter finals in all events. at the world tour grand finals of 2006, he won gold. after that, waldner ends his international career. he played national until 2016 when he retired.