diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx
index a64486754..e66eb8e56 100644
--- a/ts/components/session/LeftPaneMessageSection.tsx
+++ b/ts/components/session/LeftPaneMessageSection.tsx
@@ -467,6 +467,7 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
         id: 'connectToServer',
         type: 'success',
       });
+      this.setState({ loading: true });
       await OpenGroup.join(serverUrl, async () => {
         if (await OpenGroup.serverExists(serverUrl)) {
           ToastUtils.push({
@@ -474,9 +475,8 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
             id: 'connectToServer',
             type: 'success',
           });
-
-          this.setState({ loading: true });
         }
+        this.setState({ loading: false });
       });
       const openGroupConversation = await OpenGroup.getConversation(serverUrl);
 
@@ -498,6 +498,7 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
         id: 'connectToServer',
         type: 'error',
       });
+      this.setState({ loading: false });
     } finally {
       this.setState({
         loading: false,
diff --git a/ts/session/types/OpenGroup.ts b/ts/session/types/OpenGroup.ts
index 4666bdefa..e8fd0f2e2 100644
--- a/ts/session/types/OpenGroup.ts
+++ b/ts/session/types/OpenGroup.ts
@@ -129,7 +129,7 @@ export class OpenGroup {
 
       conversation = await PromiseUtils.timeout(
         window.attemptConnection(prefixedServer, channel),
-        5000
+        15000
       );
       if (!conversation) {
         throw new Error(window.i18n('connectToServerFail'));