diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.ts b/apps/server/src/provider/Layers/ClaudeAdapter.ts
index e000ba120..9cc9beb83 100644
--- a/apps/server/src/provider/Layers/ClaudeAdapter.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.ts
@@ -1995,7 +1995,7 @@ function makeClaudeAdapter(options?: ClaudeAdapterLiveOptions) {
               requestId: asRuntimeRequestId(requestId),
               payload: { questions },
               providerRefs: {
-                ...(context.session.threadId ? { providerThreadId: context.session.threadId } : {}),
+                ...providerThreadRef(context),
                 ...(context.turnState ? { providerTurnId: String(context.turnState.turnId) } : {}),
                 providerRequestId: requestId,
               },
@@ -2034,7 +2034,7 @@ function makeClaudeAdapter(options?: ClaudeAdapterLiveOptions) {
               requestId: asRuntimeRequestId(requestId),
               payload: { answers },
               providerRefs: {
-                ...(context.session.threadId ? { providerThreadId: context.session.threadId } : {}),
+                ...providerThreadRef(context),
                 ...(context.turnState ? { providerTurnId: String(context.turnState.turnId) } : {}),
                 providerRequestId: requestId,
               },
@@ -2116,9 +2116,7 @@ function makeClaudeAdapter(options?: ClaudeAdapterLiveOptions) {
                   },
                 },
                 providerRefs: {
-                  ...(context.session.threadId
-                    ? { providerThreadId: context.session.threadId }
-                    : {}),
+                  ...providerThreadRef(context),
                   ...(context.turnState
                     ? { providerTurnId: String(context.turnState.turnId) }
                     : {}),
@@ -2167,9 +2165,7 @@ function makeClaudeAdapter(options?: ClaudeAdapterLiveOptions) {
                   decision,
                 },
                 providerRefs: {
-                  ...(context.session.threadId
-                    ? { providerThreadId: context.session.threadId }
-                    : {}),
+                  ...providerThreadRef(context),
                   ...(context.turnState
                     ? { providerTurnId: String(context.turnState.turnId) }
                     : {}),