diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts
index b5da568d5..efa4028f8 100644
--- a/apps/server/src/app.ts
+++ b/apps/server/src/app.ts
@@ -184,10 +184,7 @@ export const startServer = async (): Promise<{ message: string; serverPort: numb
   // the express server must be started before the socket otherwise the on error event listener will not attach properly
   const resultPort = await serverTryDesiredPort(expressServer, desiredPort);
   await getDataProvider().setSettings({ ...settings, serverPort: resultPort });
-  let showWelcome = await getShowWelcomeDialog();
-  if (restorePoint) {
-    showWelcome = false;
-  }
+  const showWelcome = await getShowWelcomeDialog(!!restorePoint);
 
   socket.init(expressServer, showWelcome, prefix);
 
diff --git a/apps/server/src/services/app-state-service/AppStateService.ts b/apps/server/src/services/app-state-service/AppStateService.ts
index 45bfe05d3..2b6b64b25 100644
--- a/apps/server/src/services/app-state-service/AppStateService.ts
+++ b/apps/server/src/services/app-state-service/AppStateService.ts
@@ -46,10 +46,12 @@ export async function setLastLoadedRundown(rundownKey: string): Promise<void> {
   await config.write();
 }
 
-export async function getShowWelcomeDialog(): Promise<boolean> {
+export async function getShowWelcomeDialog(restorePointExists: boolean): Promise<boolean> {
   // in test environment, we do not want the dialog
   if (isTest) return false;
 
+  if (restorePointExists) return false;
+
   await config.read();
   return config.data.showWelcomeDialog ?? true; // default to  true
 }