Ive had a similar issue with beasts and wildshape. Its made worse when an NPC interaction automatically trigger aftet a fight and is hostile due to it. No opportunity to wildshape out or dismiss my pet even if i was willing to waste the resource. I was just walking through a camp and got in a fight over my wolf being out. Pretty frustrating.
