The Calgary Flames signed Andrew Mangiapane to a two-year, $4.85 million contract on Friday, avoiding arbitration.

Mangiapane will carry a cap hit of $2.425 million under the new contract.

The 24-year-old forward had 17 goals and 32 points in 68 games with the Flames this past season. He had two goals and five points in 10 games during the NHL's Return to Play.

A sixth-round pick of the Flames in 2015, Mangiapane has 25 goals and 45 points in 122 career games with the team.