diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts
index 6b8c581105..c288156865 100644
--- a/apps/cli/src/commands/edit.command.ts
+++ b/apps/cli/src/commands/edit.command.ts
@@ -170,7 +170,7 @@ export class EditCommand {
     let folderView = await folder.decrypt();
     folderView = FolderExport.toView(req, folderView);
 
-    const userKey = await this.keyService.getUserKeyWithLegacySupport(activeUserId);
+    const userKey = await this.keyService.getUserKey(activeUserId);
     const encFolder = await this.folderService.encrypt(folderView, userKey);
     try {
       const folder = await this.folderApiService.save(encFolder, activeUserId);
diff --git a/libs/common/src/key-management/crypto/models/enc-string.spec.ts b/libs/common/src/key-management/crypto/models/enc-string.spec.ts
index ca9abb5d9d..1be28d5896 100644
--- a/libs/common/src/key-management/crypto/models/enc-string.spec.ts
+++ b/libs/common/src/key-management/crypto/models/enc-string.spec.ts
@@ -83,7 +83,7 @@ describe("EncString", () => {
 
       const keyService = mock<KeyService>();
       keyService.hasUserKey.mockResolvedValue(true);
-      keyService.getUserKeyWithLegacySupport.mockResolvedValue(
+      keyService.getUserKey.mockResolvedValue(
         new SymmetricCryptoKey(makeStaticByteArray(32)) as UserKey,
       );
 
@@ -282,7 +282,7 @@ describe("EncString", () => {
 
       await encString.decrypt(null, key);
 
-      expect(keyService.getUserKeyWithLegacySupport).not.toHaveBeenCalled();
+      expect(keyService.getUserKey).not.toHaveBeenCalled();
       expect(encryptService.decryptString).toHaveBeenCalledWith(encString, key);
     });
 
@@ -300,11 +300,11 @@ describe("EncString", () => {
     it("gets the user's decryption key if required", async () => {
       const userKey = mock<UserKey>();
 
-      keyService.getUserKeyWithLegacySupport.mockResolvedValue(userKey);
+      keyService.getUserKey.mockResolvedValue(userKey);
 
       await encString.decrypt(null, null);
 
-      expect(keyService.getUserKeyWithLegacySupport).toHaveBeenCalledWith();
+      expect(keyService.getUserKey).toHaveBeenCalledWith();
       expect(encryptService.decryptString).toHaveBeenCalledWith(encString, userKey);
     });
   });
diff --git a/libs/common/src/key-management/crypto/models/enc-string.ts b/libs/common/src/key-management/crypto/models/enc-string.ts
index b979698dfb..47aa41275d 100644
--- a/libs/common/src/key-management/crypto/models/enc-string.ts
+++ b/libs/common/src/key-management/crypto/models/enc-string.ts
@@ -191,9 +191,7 @@ export class EncString implements Encrypted {
 
   private async getKeyForDecryption(orgId: string) {
     const keyService = Utils.getContainerService().getKeyService();
-    return orgId != null
-      ? await keyService.getOrgKey(orgId)
-      : await keyService.getUserKeyWithLegacySupport();
+    return orgId != null ? await keyService.getOrgKey(orgId) : await keyService.getUserKey();
   }
 }