Merge pull request #5561 from dangwynne/develop

fix issue 16226 to allow switching back to default HS.

src/components/views/dialogs/ServerPickerDialog.tsx

@@ -157,7 +157,7 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
             return;
         }
 
-        this.props.onFinished(this.validatedConf);
+        this.props.onFinished(this.state.defaultChosen ? this.defaultServer : this.validatedConf);
     };
 
     public render() {