Riga Cathedral
In 1933 Kalniņš returned to Riga, where he took the post of organist at Riga Cathedral. Between 1944 and 1948 he was the Rector of the Latvian Academy of Music, where he gave organ lessons too. In 1948 he retired, and died three years later.