Scaleout message bus fix

For #2070