diff --git a/configUtil.js b/configUtil.js
index 438114a99..47c36a1ad 100644
--- a/configUtil.js
+++ b/configUtil.js
@@ -26,8 +26,6 @@ module.exports = {
         'base-uri ': "'self'",
         'frame-ancestors': " 'none'",
         'form-action': "'none'",
-        'report-uri': 'https://csp-reporter.ente.io',
-        'report-to': 'https://csp-reporter.ente.io',
     },
 
     WORKBOX_CONFIG: {
diff --git a/src/components/RecoveryKeyModal.tsx b/src/components/RecoveryKeyModal.tsx
index 7dce0fdd1..6391cfbc6 100644
--- a/src/components/RecoveryKeyModal.tsx
+++ b/src/components/RecoveryKeyModal.tsx
@@ -20,12 +20,14 @@ function RecoveryKeyModal({ somethingWentWrong, ...props }: Props) {
             return;
         }
         const main = async () => {
-            const recoveryKey = await getRecoveryKey();
-            if (!recoveryKey) {
+            try {
+                const recoveryKey = await getRecoveryKey();
+                setRecoveryKey(bip39.entropyToMnemonic(recoveryKey));
+            } catch (e) {
                 somethingWentWrong();
+            } finally {
                 props.onHide();
             }
-            setRecoveryKey(bip39.entropyToMnemonic(recoveryKey));
         };
         main();
     }, [props.show]);
diff --git a/src/utils/crypto/index.ts b/src/utils/crypto/index.ts
index 9e1e39bd5..3b0604393 100644
--- a/src/utils/crypto/index.ts
+++ b/src/utils/crypto/index.ts
@@ -106,7 +106,7 @@ export const SaveKeyInSessionStore = async (
 };
 
 export const getRecoveryKey = async () => {
-    let recoveryKey = null;
+    let recoveryKey: string = null;
     try {
         const cryptoWorker = await new CryptoWorker();
 
@@ -129,6 +129,7 @@ export const getRecoveryKey = async () => {
         return recoveryKey;
     } catch (e) {
         logError(e, 'getRecoveryKey failed');
+        throw e;
     }
 };
 
@@ -138,7 +139,7 @@ async function createNewRecoveryKey() {
 
     const cryptoWorker = await new CryptoWorker();
 
-    const recoveryKey = await cryptoWorker.generateEncryptionKey();
+    const recoveryKey: string = await cryptoWorker.generateEncryptionKey();
     const encryptedMasterKey: B64EncryptionResult =
         await cryptoWorker.encryptToB64(masterKey, recoveryKey);
     const encryptedRecoveryKey: B64EncryptionResult =