diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
index 420eee0da8aa82884d2b5b4fc6db23a90a71ae13..d412004cf2e688d88d057fc53afb8785da794d31 100644
--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
@@ -491,7 +491,7 @@ const make = Effect.gen(function* () {
         const assistantDeliveryMode = yield* resolveAssistantDeliveryModeForMessage({
           threadId: thread.id,
           sessionId: event.sessionId,
-          turnId,
+          ...(turnId ? { turnId } : {}),
           messageId: assistantMessageId,
         });
         yield* rememberAssistantDeliveryModeForMessage(assistantMessageId, assistantDeliveryMode);
@@ -520,7 +520,7 @@ const make = Effect.gen(function* () {
         const assistantDeliveryMode = yield* resolveAssistantDeliveryModeForMessage({
           threadId: thread.id,
           sessionId: event.sessionId,
-          turnId,
+          ...(turnId ? { turnId } : {}),
           messageId: assistantMessageId,
         });
         yield* rememberAssistantDeliveryModeForMessage(assistantMessageId, assistantDeliveryMode);