diff --git a/ts/background.ts b/ts/background.ts
index e3cce321870e..9130004dae5e 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -2315,7 +2315,8 @@ export async function startApp(): Promise<void> {
             window.Whisper.events.once(event, () => resolve());
             return promise;
           },
-          'firstRun:waitForEvent'
+          'firstRun:waitForEvent',
+          { timeout: 2 * durations.MINUTE }
         );
 
         let storageServiceSyncComplete: Promise<void>;