Bad Omen is Sticky!

On a realm with some friends, slowing my pace a bit by doing a 'Pay-2-Win' style playthrough.  This means I am often working with Villagers and Villager trading halls to source 90% of my tools / materials / etc.
To effectively do this, I have an Emerald Farm that I use to source emeralds for trades.
I have tested this a few different ways but have not found a way to work around this issue, and it is rather infuriating.
After farming for a bit, it does not matter if I drink milk, it does not matter if I drink 100 milks, it does not matter if I unalive myself.  Bad Omen is sticky!
There is no icon / debuff for it, nor are there any particle effects, however every single time, without fail, returning to my base (in a village) or to my trade hall (which has villagers), I will ALWAYS start a raid.
My temporary workaround has been either trapping them in an empty house or trapping the last survivor of round 1 in a boat, which is fine, I just have to deal with the constant BUM BUM BUM BUUUUUUUUM.

Considering I have 2 concurrent raids at both locations, I am unable to attach a video at this time.  When these raids time out, I will work on posting it here.