diff --git a/keyserver/src/creators/account-creator.js b/keyserver/src/creators/account-creator.js
--- a/keyserver/src/creators/account-creator.js
+++ b/keyserver/src/creators/account-creator.js
@@ -205,7 +205,7 @@
 
 export type ProcessSIWEAccountCreationRequest = {
   +address: string,
-  +calendarQuery?: ?CalendarQuery,
+  +calendarQuery: CalendarQuery,
   +deviceTokenUpdateRequest?: ?DeviceTokenUpdateRequest,
   +platformDetails: PlatformDetails,
   +primaryIdentityPublicKey: ?string,
@@ -217,12 +217,8 @@
   viewer: Viewer,
   request: ProcessSIWEAccountCreationRequest,
 ): Promise<string> {
-  const promises = [];
-
   const { calendarQuery } = request;
-  if (calendarQuery) {
-    promises.push(verifyCalendarQueryThreadIDs(calendarQuery));
-  }
+  await verifyCalendarQueryThreadIDs(calendarQuery);
 
   const time = Date.now();
   const deviceToken = request.deviceTokenUpdateRequest
@@ -246,9 +242,7 @@
   ]);
   viewer.setNewCookie(userViewerData);
 
-  if (calendarQuery) {
-    await setNewSession(viewer, calendarQuery, 0);
-  }
+  await setNewSession(viewer, calendarQuery, 0);
 
   await Promise.all([
     updateThread(
diff --git a/keyserver/src/responders/user-responders.js b/keyserver/src/responders/user-responders.js
--- a/keyserver/src/responders/user-responders.js
+++ b/keyserver/src/responders/user-responders.js
@@ -409,10 +409,11 @@
   if (!userID) {
     const siweAccountCreationRequest = {
       address: siweMessage.address,
-      deviceTokenUpdateRequest: deviceTokenUpdateRequest,
+      calendarQuery,
+      deviceTokenUpdateRequest,
       platformDetails,
-      primaryIdentityPublicKey: primaryIdentityPublicKey,
-      socialProof: socialProof,
+      primaryIdentityPublicKey,
+      socialProof,
     };
     userID = await processSIWEAccountCreation(
       viewer,