He then led Argentina to their first ever Davis Cup victory by defeating Croatia's Marin Čilić in the final in Zagreb from two sets down. He reached his first major semi-final since 2013 by defeating Roger Federer in the quarter-finals of the 2017 US Open. In 2018, he won his first Masters 1000 title at the Indian Wells Masters, defeating defending champion and World No. 1 Roger Federer in the final. After reaching the semi-finals of the 2018 French Open, he again matched his career high of No. 4. Finally, in August, he achieved the World No. 3 ranking for the first time. At the 2018 US Open, he reached his second Grand Slam final.