Roger Federer has confirmed he will play at the French Open and Tokyo Olympic Games in 2020.

The 38-year-old returned to Roland Garros this summer for the first time since 2016, but lost in the semi-finals to Rafael Nadal.

The Swiss player will again try to add to his only major title in Paris before taking to the court in Japan after missing the last Olympic Games in Rio de Janeiro due to injury.

“I will play the French Open. I probably won’t play much before it, because I need time away,” the world number three told CNN.

“Before that we need a vacation. At the end of the day my heart decided I would love to play the Olympic Games again.

“I’ve been debating with my team for a few weeks now, months actually, what I should do in the summer after Wimbledon and before the U.S. Open [in 2020].

“I carried the flag twice for Switzerland in Athens and Beijing, I’ve got a gold and a silver, and I would love to play again so I’m very excited.”