Still not really reproducing locally, but this PR should help with it, I will get @kelv to review because he moved this to an observer initially: