Add workaround for Mercury/32 servers that will subscribe again to