Hello, I know you've posted this question a million years ago, and since it's been that long...have you managed to resolve it by any chance?
I'm trying to help a friend with that exact issue, I came across answers such as,"uninstall WhatsApp while in safe mode...", but I'm not sure it will work...