diff --git a/ts/background.ts b/ts/background.ts
index 72e38b18f..42fa29fef 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -202,6 +202,10 @@ export async function startApp(): Promise<void> {
     );
     window.textsecure.server = server;
 
+    initializeAllJobQueues({
+      server,
+    });
+
     challengeHandler = new ChallengeHandler({
       storage: window.storage,
 
@@ -1618,11 +1622,6 @@ export async function startApp(): Promise<void> {
     strictAssert(challengeHandler, 'start: challengeHandler');
     await challengeHandler.load();
 
-    strictAssert(server, 'start: server');
-    initializeAllJobQueues({
-      server,
-    });
-
     if (!window.storage.user.getNumber()) {
       const ourConversation =
         window.ConversationController.getOurConversation();