diff --git a/libs/common/src/vault/services/collection.service.ts b/libs/common/src/vault/services/collection.service.ts
index 2c91651a0e0..bd29147eaa9 100644
--- a/libs/common/src/vault/services/collection.service.ts
+++ b/libs/common/src/vault/services/collection.service.ts
@@ -33,7 +33,7 @@ const DECRYPTED_COLLECTION_DATA_KEY = DeriveDefinition.from<
   CollectionView[],
   { collectionService: CollectionService }
 >(ENCRYPTED_COLLECTION_DATA_KEY, {
-  deserializer: (obj) => obj.map((collection) => CollectionView.fromJSON(collection)),
+  deserializer: (obj) => obj?.map((collection) => CollectionView.fromJSON(collection)),
   derive: async (collections: Record<CollectionId, CollectionData>, { collectionService }) => {
     const data: Collection[] = [];
     for (const id in collections ?? {}) {
diff --git a/libs/common/src/vault/services/key-state/folder.state.ts b/libs/common/src/vault/services/key-state/folder.state.ts
index 7fbd63ed76d..d3c2f770eac 100644
--- a/libs/common/src/vault/services/key-state/folder.state.ts
+++ b/libs/common/src/vault/services/key-state/folder.state.ts
@@ -16,7 +16,7 @@ export const FOLDER_DECRYPTED_FOLDERS = DeriveDefinition.from<
   FolderView[],
   { folderService: FolderService; cryptoService: CryptoService }
 >(FOLDER_ENCRYPTED_FOLDERS, {
-  deserializer: (obj) => obj.map((f) => FolderView.fromJSON(f)),
+  deserializer: (obj) => obj?.map((f) => FolderView.fromJSON(f)),
   derive: async (from, { folderService, cryptoService }) => {
     const folders = Object.values(from || {}).map((f) => new Folder(f));