I’ve found the issue and I’m working on a fix, it’s just a bug with the change to use upcoming changes. I’m checking if the current user (AKA the impersonated user) can impersonate when stopping the impersonation, rather than the acting user (the admin).
This only happens when Staff is used for the upcoming change “Enabled for”