diff --git a/server/core/src/pipeline.ts b/server/core/src/pipeline.ts
index effd184d37..9777ea7fad 100644
--- a/server/core/src/pipeline.ts
+++ b/server/core/src/pipeline.ts
@@ -73,9 +73,9 @@ class TPipeline implements Pipeline {
   }
 
   async tx (ctx: SessionContext, tx: Tx): Promise<[TxResult, Tx[], string | undefined]> {
-    const [session, resTx] = this.head === undefined ? [ctx, tx] : await this.head.tx(ctx, tx)
+    const [session, resTx, target] = this.head === undefined ? [ctx, tx] : await this.head.tx(ctx, tx)
     const res = await this.storage.tx(session, resTx)
-    return [...res, undefined]
+    return [res[0], res[1], target]
   }
 
   async close (): Promise<void> {
diff --git a/server/middleware/src/configuration.ts b/server/middleware/src/configuration.ts
index b56ff717d8..6f92d07cea 100644
--- a/server/middleware/src/configuration.ts
+++ b/server/middleware/src/configuration.ts
@@ -46,7 +46,6 @@ export class ConfigurationMiddleware extends BaseMiddleware implements Middlewar
   }
 
   async tx (ctx: SessionContext, tx: Tx): Promise<TxMiddlewareResult> {
-    let target: string | undefined
     if (this.storage.hierarchy.isDerived(tx._class, core.class.TxCUD)) {
       const txCUD = tx as TxCUD<Doc>
       const domain = this.storage.hierarchy.getDomain(txCUD.objectClass)
@@ -59,8 +58,7 @@ export class ConfigurationMiddleware extends BaseMiddleware implements Middlewar
         }
       }
     }
-    const res = await this.provideTx(ctx, tx)
-    return [res[0], res[1], res[2] ?? target]
+    return await this.provideTx(ctx, tx)
   }
 
   override async findAll<T extends Doc>(
diff --git a/server/middleware/src/modified.ts b/server/middleware/src/modified.ts
index fe507c2a3b..e5e2ec522d 100644
--- a/server/middleware/src/modified.ts
+++ b/server/middleware/src/modified.ts
@@ -41,7 +41,6 @@ export class ModifiedMiddleware extends BaseMiddleware implements Middleware {
       const coltx = tx as TxCollectionCUD<Doc, AttachedDoc>
       coltx.tx.modifiedOn = tx.modifiedOn
     }
-    const res = await this.provideTx(ctx, tx)
-    return [res[0], res[1], res[2]]
+    return await this.provideTx(ctx, tx)
   }
 }