Try to avoid UI hang on connect