From c6b68a82b9ff0af5324fa3fef81dafc8fe07095e Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Mon, 23 Sep 2024 08:42:19 -0400
Subject: [PATCH] [MM-60201] Fixed a potential crash on removing server (#3152)

---
 src/app/serverViewState.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/serverViewState.ts b/src/app/serverViewState.ts
index 6cff3392..18e3d2f5 100644
--- a/src/app/serverViewState.ts
+++ b/src/app/serverViewState.ts
@@ -208,11 +208,11 @@ export class ServerViewState {
                     this.currentServerId = remainingServers[0].id;
                 }
 
+                ServerManager.removeServer(server.id);
+
                 if (!remainingServers.length) {
                     delete this.currentServerId;
                 }
-
-                ServerManager.removeServer(server.id);
             }
         }).catch((e) => {
             // e is undefined for user cancellation