properly switch DisableMessageHandling

fixes #1801