diff --git a/src/sqlite/SQLiteWorkspace.swift b/src/sqlite/SQLiteWorkspace.swift
index 890e066f2..07115a5d6 100644
--- a/src/sqlite/SQLiteWorkspace.swift
+++ b/src/sqlite/SQLiteWorkspace.swift
@@ -526,7 +526,7 @@ public final class SQLiteWorkspace: Workspace {
     public func subscribe<Element: Atom & Equatable>(
       object: Element, bufferingPolicy: AsyncStream<Element>.Continuation.BufferingPolicy
     ) -> AsyncStream<Element> {
-      AsyncStream { continuation in
+      AsyncStream(bufferingPolicy: bufferingPolicy) { continuation in
         let cancellable = self.subscribe(object: object) { object in
           switch object {
           case .deleted:
@@ -546,7 +546,7 @@ public final class SQLiteWorkspace: Workspace {
       fetchedResult: FetchedResult<Element>,
       bufferingPolicy: AsyncStream<FetchedResult<Element>>.Continuation.BufferingPolicy
     ) -> AsyncStream<FetchedResult<Element>> {
-      AsyncStream { continuation in
+      AsyncStream(bufferingPolicy: bufferingPolicy) { continuation in
         let cancellable = self.subscribe(fetchedResult: fetchedResult) { fetchedResult in
           continuation.yield(fetchedResult)
         }
diff --git a/src/tests/AsyncTests.swift b/src/tests/AsyncTests.swift
index c6aab2d22..81bb44932 100644
--- a/src/tests/AsyncTests.swift
+++ b/src/tests/AsyncTests.swift
@@ -144,14 +144,13 @@ class AsyncTests: XCTestCase {
         MyGame.Sample.Monster.mana <= 50, orderBy: [MyGame.Sample.Monster.mana.ascending])
       XCTAssertEqual(fetchedResult.count, 6)
       let subscribeTask = Task { () -> FetchedResult<MyGame.Sample.Monster> in
-        var updateCount = 0
         var updatedFetchedResult = fetchedResult
         for await newFetchedResult in dflat.subscribe(
           fetchedResult: fetchedResult, bufferingPolicy: .unbounded)
         {
           updatedFetchedResult = newFetchedResult
-          updateCount += 1
-          if updateCount == 4 {
+          if newFetchedResult.first(where: { $0.name == "name 3" }) == nil {
+            // We've deleted this one, that's the last mutation, exit.
             break
           }
         }