diff --git a/app/lib/methods/logout.ts b/app/lib/methods/logout.ts
index 0371ab4a9..a7c56a77c 100644
--- a/app/lib/methods/logout.ts
+++ b/app/lib/methods/logout.ts
@@ -81,15 +81,19 @@ export async function removeServer({ server }: { server: string }): Promise<void
 		if (userId) {
 			const resume = UserPreferences.getString(`${TOKEN_KEY}-${userId}`);
 
-			const sdk = new RocketchatClient({ host: server, protocol: 'ddp', useSsl: isSsl(server) });
-			await sdk.login({ resume });
+			try {
+				const sdk = new RocketchatClient({ host: server, protocol: 'ddp', useSsl: isSsl(server) });
+				await sdk.login({ resume });
 
-			const token = getDeviceToken();
-			if (token) {
-				await sdk.del('push.token', { token });
+				const token = getDeviceToken();
+				if (token) {
+					await sdk.del('push.token', { token });
+				}
+
+				await sdk.logout();
+			} catch (e) {
+				log(e);
 			}
-
-			await sdk.logout();
 		}
 
 		await removeServerData({ server });