The Disney Channel’s Andi Mack is gearing up to tackle yet another important issue.

In a press release sent out by the network on Tuesday (November 13), the Disney Channel announced that the hit original series Andi Mack will be tackling the topic of gun safety in a series of upcoming episodes.

The story arc is set to span two episodes, the first of which will air later this week on Friday, November 16. The second part will air the following week on Friday, November 30.

According to the press release, the storyline “illustrates peer pressure and a true test of character for Cyrus (Joshua Rush) when T.J. (Luke Mullen) and his group of friends unexpectedly invite Cyrus to join their unsupervised target practice.”

The series took the necessary steps to make sure the story arc is well presented. To do this, Disney Channel programmers sought out the consultancy of child development experts at The Brady Center and Hollywood, Health & Society. Additionally, both episodes will include a public service announcement about gun safety.

This isn’t the first time Andi Mack has pushed the envelope when it comes to striving to present real world issues facing kids today.

Just last October, the series kicked off its second season by introducing a gay storyline for one of their main characters.

It’s great to see that the series, which is helmed by Lizzie McGuire’s Terri Minsky, is continuing to tackle tough issues in an effort to open a dialogue for its young viewers and their parents.

Andi Mack airs Fridays at 8 p.m. on The Disney Channel.