An update to MM went live a couple of hours ago that should help with this considerably. Please let us know if you continue to have trouble.
devtrackers.gg
