OTA Lollipop breaks notification sound topic

Updated my T-mobile Galaxy S5 to Lollipop yesterday and now notification sound is stuck on default whistle sound, ignoring my custom sound even though it's the one selected as default notification sound. It worked fine before the update, and my custom ringtone works after the update. I attempted clearing cache settings in Storage and rebooting, but that has not worked.