From f3acb9d1b59c477adb8733bbeca837cc6ff5d0f3 Mon Sep 17 00:00:00 2001
From: Matt Czech <matt@livefront.com>
Date: Thu, 11 Dec 2025 14:35:28 -0600
Subject: [PATCH 1/3] [PM-28339] Move FetchedResultsSubscription's initial
 fetch into background queue

---
 .../Platform/Utilities/FetchedResultsPublisher.swift | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift b/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift
index c53807ade2..5d5e7aaec8 100644
--- a/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift
+++ b/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift
@@ -137,16 +137,16 @@ private final class FetchedResultsSubscription<SubscriberType, ResultType, Outpu
 
         controller?.delegate = self
 
-        do {
-            try controller?.performFetch()
-            if controller?.fetchedObjects != nil {
-                queue.async {
+        queue.async {
+            do {
+                try self.controller?.performFetch()
+                if self.controller?.fetchedObjects != nil {
                     self.hasChangesToSend = true
                     self.fulfillDemand()
                 }
+            } catch {
+                subscriber.receive(completion: .failure(error))
             }
-        } catch {
-            subscriber.receive(completion: .failure(error))
         }
     }
 

From 11b38ee183e1bb1b3d99643b7943d55c1817287e Mon Sep 17 00:00:00 2001
From: Matt Czech <matt@livefront.com>
Date: Mon, 15 Dec 2025 09:46:02 -0600
Subject: [PATCH 2/3] [PM-28339] Move performFetch into managed object context

---
 .../Core/Platform/Utilities/FetchedResultsPublisher.swift | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift b/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift
index 5d5e7aaec8..4f90bcff79 100644
--- a/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift
+++ b/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift
@@ -137,12 +137,14 @@ private final class FetchedResultsSubscription<SubscriberType, ResultType, Outpu
 
         controller?.delegate = self
 
-        queue.async {
+        context.perform {
             do {
                 try self.controller?.performFetch()
                 if self.controller?.fetchedObjects != nil {
-                    self.hasChangesToSend = true
-                    self.fulfillDemand()
+                    self.queue.async {
+                        self.hasChangesToSend = true
+                        self.fulfillDemand()
+                    }
                 }
             } catch {
                 subscriber.receive(completion: .failure(error))

From eb7bfc672b90161cd607fb253e2e8975701643c5 Mon Sep 17 00:00:00 2001
From: Matt Czech <matt@livefront.com>
Date: Mon, 15 Dec 2025 10:50:03 -0600
Subject: [PATCH 3/3] [PM-28339] Move subscription completion into the queue

---
 .../Core/Platform/Utilities/FetchedResultsPublisher.swift     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift b/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift
index 4f90bcff79..8b508d2781 100644
--- a/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift
+++ b/BitwardenKit/Core/Platform/Utilities/FetchedResultsPublisher.swift
@@ -147,7 +147,9 @@ private final class FetchedResultsSubscription<SubscriberType, ResultType, Outpu
                     }
                 }
             } catch {
-                subscriber.receive(completion: .failure(error))
+                self.queue.async {
+                    self.subscriber?.receive(completion: .failure(error))
+                }
             }
         }
     }