diff --git a/src/common/servers/serverManager.ts b/src/common/servers/serverManager.ts
index ae323372..b36445a4 100644
--- a/src/common/servers/serverManager.ts
+++ b/src/common/servers/serverManager.ts
@@ -238,6 +238,10 @@ export class ServerManager extends EventEmitter {
             this.currentServerId = this.serverOrder[0];
         }
 
+        if (!this.hasServers()) {
+            delete this.currentServerId;
+        }
+
         this.persistServers();
     }
 
diff --git a/src/main/app/intercom.ts b/src/main/app/intercom.ts
index 5b947759..e35263e8 100644
--- a/src/main/app/intercom.ts
+++ b/src/main/app/intercom.ts
@@ -38,6 +38,10 @@ function handleShowOnboardingScreens(showWelcomeScreen: boolean, showNewServerMo
     log.debug('handleShowOnboardingScreens', {showWelcomeScreen, showNewServerModal, mainWindowIsVisible});
 
     if (showWelcomeScreen) {
+        if (ModalManager.isModalDisplayed()) {
+            return;
+        }
+
         handleWelcomeScreenModal();
 
         if (process.env.NODE_ENV === 'test') {