During the Sengoku period, the area surrounding Mount Komaki was the site of the Battle of Komaki and Nagakute in 1584. It was part of the holdings of Owari Domain during the Edo period. During the Meiji period, the area was organized into villages under Higashikasugai District, Aichi. Komaki was proclaimed a town on July 16, 1906. Komaki was raised to city status on January 1, 1955, after merging with the village of Kitasato in Nishikasugai District, Aichi
