On 1 July 2021, Klavan signed for Estonian Meistriliiga club Paide Linnameeskond, returning to Estonia after 17 years abroad.
In July of 2021, Klavan joined Estonian Meistriliiga team Paide Linnameeskond, marking his return to Estonia after a period of 17 years spent playing abroad.