diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx
index c34307d14..03210e07f 100644
--- a/ts/components/session/LeftPaneMessageSection.tsx
+++ b/ts/components/session/LeftPaneMessageSection.tsx
@@ -487,11 +487,6 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
           this.setState({ loading: true });
         }
       });
-
-      this.handleToggleOverlay(undefined);
-      this.setState({
-        loading: false,
-      });
     } catch (e) {
       this.setState({
         loading: false,
@@ -502,6 +497,10 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
         id: 'connectToServerFail',
         type: 'error',
       });
+    } finally {
+      this.setState({
+        loading: false,
+       });
     }
   }