diff --git a/libs/common/src/models/response/organizationExportResponse.ts b/libs/common/src/models/response/organizationExportResponse.ts
index 847fcab96be..061b57d59f8 100644
--- a/libs/common/src/models/response/organizationExportResponse.ts
+++ b/libs/common/src/models/response/organizationExportResponse.ts
@@ -9,7 +9,13 @@ export class OrganizationExportResponse extends BaseResponse {
 
   constructor(response: any) {
     super(response);
-    this.collections = this.getResponseProperty("Collections");
-    this.ciphers = this.getResponseProperty("Ciphers");
+    const collections = this.getResponseProperty("Collections");
+    if (collections != null) {
+      this.collections = new ListResponse(collections, CollectionResponse);
+    }
+    const ciphers = this.getResponseProperty("Ciphers");
+    if (ciphers != null) {
+      this.ciphers = new ListResponse(ciphers, CipherResponse);
+    }
   }
 }