diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index 43899d3514e3cae96efb5fe03c5200d89ae57fcf..96669e57f075045423583a3214669bcf38ef96b7 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -1046,7 +1046,7 @@ const connection = Penpal.connectToParent({
           window.viamApi.contactsGetTrusteeContactsPublicKeys,
           null
         );
-        console.log({ response });
+
         if (response.code !== "200") {
           return response;
         }
@@ -1059,9 +1059,8 @@ const connection = Penpal.connectToParent({
           const deviceData = Object.values(device);
           return deviceData.some(data => data.hasShamir === "0");
         });
-        console.log({ hasNewTrustees });
+
         if (!hasNewTrustees) {
-          console.log("RETURNING");
           return response;
         }
 
@@ -1070,19 +1069,18 @@ const connection = Penpal.connectToParent({
         const trusteesToDevices = Object.entries(responseData);
         const sharesNumber = trusteesUuids.length;
         const recoveryKey = generateRecoveryKey();
-        console.log({ recoveryKey });
-        const recoveryKeyShares = getRecoveryKeyShares(
-          recoveryKey,
-          sharesNumber
-        );
-        console.log({ recoveryKeyShares });
-        const sanityCheckResponse = checkRecoveryKeyCombine(
-          recoveryKey,
-          recoveryKeyShares
-        );
-        console.log({ sanityCheckResponse });
-        if (sanityCheckResponse.code !== "200") {
-          return sanityCheckResponse;
+        let recoveryKeyShares = [recoveryKey];
+        if (sharesNumber > 1) {
+          recoveryKeyShares = getRecoveryKeyShares(recoveryKey, sharesNumber);
+
+          const sanityCheckResponse = checkRecoveryKeyCombine(
+            recoveryKey,
+            recoveryKeyShares
+          );
+
+          if (sanityCheckResponse.code !== "200") {
+            return sanityCheckResponse;
+          }
         }
 
         // Encrypt each share with every publicKey of each contact device
@@ -1119,7 +1117,7 @@ const connection = Penpal.connectToParent({
           null,
           shamirParts
         );
-
+        console.log({ saveShamirPartsResponse });
         if (saveShamirPartsResponse !== "200") {
           return saveShamirPartsResponse;
         }