diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js
index ccc880de6..ed8ad7511 100644
--- a/frontend/src/lib/storage-manager/storage-manager.js
+++ b/frontend/src/lib/storage-manager/storage-manager.js
@@ -300,7 +300,7 @@ export class StorageManager {
   _getFromStorage(storage, location, options=this._options) {
     const encryption = options.encryption && (options.encryption.all || options.encryption[location]);
     if (encryption && storage.encryption) {
-      return { ...storage, ...JSON.parse(decrypt(storage.encryption.ciphertext, encryption.key) || '{}') };
+      return { ...storage, ...JSON.parse(decrypt(storage.encryption.ciphertext, this._encryptionKey[location]) || '{}') };
     } else {
       return storage;
     }
@@ -365,7 +365,7 @@ function encrypt(plaintext, key) {
 
   sodium.crypto_secretbox_easy(cipherB, plaintextB, nonceB, keyB);
 
-  return cipherB.toString('base64');
+  return cipherB;
 }
 
 // TODO debug unnecessary calls of decrypt