Favorites flag re-enabled when adding additional message switch

[JoelGit]

Not sure if this is controllable or not. Whenever a new message switch is added, the Favorites flag gets (re)enabled in the Home app. I think a work around is to have these show as separate tiles, but I prefer to keep these switches grouped as a single tile. Wonder if there is any way to prevent the favorites flag from being enabled when adding new message switches?