I think this fixes the last issue, but now seeing issues that occur with...

... swapping on entity delete, I don't know if this is a new issue or not

[#59994516]