Having the same problem with Yoast SEO and MU Domain Mappings.
Going to take a look at Vijay’s patch.
What’s up with Yoast’s attitude (not the first time I’ve reported a problem .. AND the solution … to them, only to get a rather supercilious “Yes, we know” response. If you know, Yoast, why is there no fix for months?).