diff --git a/src/app/settings/update-key.component.ts b/src/app/settings/update-key.component.ts
index 3710f01ab1..05130cbbfe 100644
--- a/src/app/settings/update-key.component.ts
+++ b/src/app/settings/update-key.component.ts
@@ -80,6 +80,9 @@ export class UpdateKeyComponent {
 
         const folders = await this.folderService.getAllDecrypted();
         for (let i = 0; i < folders.length; i++) {
+            if (folders[i].id == null) {
+                continue;
+            }
             const folder = await this.folderService.encrypt(folders[i], encKey[0]);
             request.folders.push(new FolderWithIdRequest(folder));
         }