From 95def44097062fe846c44e2bd5d02a17952589c9 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Sat, 29 Nov 2025 20:23:32 +0100
Subject: [PATCH] Catch error initializing provider keys (#17672)

---
 libs/key-management/src/key.service.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts
index 2701109fde..f2c3c0eff7 100644
--- a/libs/key-management/src/key.service.ts
+++ b/libs/key-management/src/key.service.ts
@@ -2,6 +2,7 @@ import * as bigInt from "big-integer";
 import {
   NEVER,
   Observable,
+  catchError,
   combineLatest,
   distinctUntilChanged,
   filter,
@@ -948,6 +949,13 @@ export class DefaultKeyService implements KeyServiceAbstraction {
 
             return result;
           }),
+          catchError((err: unknown) => {
+            this.logService.error(
+              `Failed to get encrypted organization keys for user ${userId}`,
+              err,
+            );
+            return of({});
+          }),
         );
       }),
     );