 The city then fell to the Grand Duchy of Baden, and was the official city of the district of Baden until 1936.Since then it has belonged to the district of Emmendingen.After WW2, which the city survived largely undamaged, Waldkirch belonged to the federal state of (South) Baden and was made part of the newly built federal state of Baden-Württemberg in 1952.