diff --git a/angular/src/components/groupings.component.ts b/angular/src/components/groupings.component.ts
index e8a97c6fd2..4176e291bc 100644
--- a/angular/src/components/groupings.component.ts
+++ b/angular/src/components/groupings.component.ts
@@ -151,7 +151,7 @@ export class GroupingsComponent {
     } else {
       this.collapsedGroupings.add(id);
     }
-    await this.stateService.setCollapsedGroupings(this.collapsedGroupings);
+    await this.stateService.setCollapsedGroupings(Array.from(this.collapsedGroupings));
   }
 
   isCollapsed(grouping: FolderView | CollectionView, idPrefix = "") {
diff --git a/common/src/abstractions/state.service.ts b/common/src/abstractions/state.service.ts
index e4c38025a4..49d3e2f67f 100644
--- a/common/src/abstractions/state.service.ts
+++ b/common/src/abstractions/state.service.ts
@@ -63,8 +63,8 @@ export abstract class StateService<T extends Account = Account> {
   getCanAccessPremium: (options?: StorageOptions) => Promise<boolean>;
   getClearClipboard: (options?: StorageOptions) => Promise<number>;
   setClearClipboard: (value: number, options?: StorageOptions) => Promise<void>;
-  getCollapsedGroupings: (options?: StorageOptions) => Promise<Set<string>>;
-  setCollapsedGroupings: (value: Set<string>, options?: StorageOptions) => Promise<void>;
+  getCollapsedGroupings: (options?: StorageOptions) => Promise<string[]>;
+  setCollapsedGroupings: (value: string[], options?: StorageOptions) => Promise<void>;
   getConvertAccountToKeyConnector: (options?: StorageOptions) => Promise<boolean>;
   setConvertAccountToKeyConnector: (value: boolean, options?: StorageOptions) => Promise<void>;
   getCryptoMasterKey: (options?: StorageOptions) => Promise<SymmetricCryptoKey>;
diff --git a/common/src/models/domain/account.ts b/common/src/models/domain/account.ts
index 012ce09cd7..5c0337e5d4 100644
--- a/common/src/models/domain/account.ts
+++ b/common/src/models/domain/account.ts
@@ -54,7 +54,7 @@ export class AccountData {
     GeneratedPasswordHistory[]
   > = new EncryptionPair<GeneratedPasswordHistory[], GeneratedPasswordHistory[]>();
   addEditCipherInfo?: any;
-  collapsedGroupings?: Set<string>;
+  collapsedGroupings?: string[];
   eventCollection?: EventData[];
   organizations?: { [id: string]: OrganizationData };
   providers?: { [id: string]: ProviderData };
diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index da7fb97aa2..30f908f761 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -388,17 +388,21 @@ export class StateService<
     );
   }
 
-  async getCollapsedGroupings(options?: StorageOptions): Promise<Set<string>> {
-    return (await this.getAccount(this.reconcileOptions(options, this.defaultInMemoryOptions)))
-      ?.data?.collapsedGroupings;
+  async getCollapsedGroupings(options?: StorageOptions): Promise<string[]> {
+    return (
+      await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()))
+    )?.data?.collapsedGroupings;
   }
 
-  async setCollapsedGroupings(value: Set<string>, options?: StorageOptions): Promise<void> {
+  async setCollapsedGroupings(value: string[], options?: StorageOptions): Promise<void> {
     const account = await this.getAccount(
-      this.reconcileOptions(options, this.defaultInMemoryOptions)
+      this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
     );
     account.data.collapsedGroupings = value;
-    await this.saveAccount(account, this.reconcileOptions(options, this.defaultInMemoryOptions));
+    await this.saveAccount(
+      account,
+      this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
+    );
   }
 
   async getConvertAccountToKeyConnector(options?: StorageOptions): Promise<boolean> {