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