diff --git a/keyserver/src/utils/olm-utils.js b/keyserver/src/utils/olm-utils.js
--- a/keyserver/src/utils/olm-utils.js
+++ b/keyserver/src/utils/olm-utils.js
@@ -109,9 +109,10 @@
 }
 
 async function uploadNewOneTimeKeys(numberOfKeys: number) {
-  const [rustAPI, identityInfo] = await Promise.all([
+  const [rustAPI, identityInfo, deviceID] = await Promise.all([
     getRustAPI(),
     fetchIdentityInfo(),
+    getContentPublicKey(),
   ]);
 
   if (!identityInfo) {
@@ -123,7 +124,6 @@
     const contentOneTimeKeys = getOneTimeKeyValuesFromBlob(
       contentAccount.one_time_keys(),
     );
-    const deviceID = JSON.parse(contentAccount.identity_keys()).curve25519;
 
     return fetchCallUpdateOlmAccount(
       'notifications',