Although he left Paris and returned to Barcelona when World War I broke out in 1914, he went to Paris again in 1921 and stayed there until 1941 when, once again he went back to Catalonia, because the German army were invading Paris in World War II. He continued to lecture about his music until he had a stroke. He died at the age of 94.