diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
index 7d4f2b44f38b7ccda21986509bbc92ee24e813cc..992ec314a69096695383044c77a58f65503fbc93 100644
--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
@@ -385,7 +385,7 @@ describe("ProviderCommandReactor", () => {
           name: "bug.png",
           mimeType: "image/png",
           sizeBytes: 5,
-          dataUrl: expectedAttachmentPath,
+          dataUrl: "data:image/png;base64,SGVsbG8=",
         },
       ],
     });
diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
index 96e12e15c301f42733120fb1859b11894e04ef6c..77a5436d42910d20a5f156115d6e5c85941bd9fa 100644
--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
@@ -455,7 +455,7 @@ const make = Effect.gen(function* () {
       return;
     }
 
-    const resolvedAttachments = yield* resolvePersistedAttachments({
+    const branchGenerationAttachments = yield* resolvePersistedAttachments({
       threadId: event.payload.threadId,
       messageId: message.id,
       attachments: message.attachments,
@@ -467,13 +467,13 @@ const make = Effect.gen(function* () {
       worktreePath: thread.worktreePath,
       messageId: message.id,
       messageText: message.text,
-      ...(message.attachments !== undefined ? { attachments: resolvedAttachments } : {}),
+      ...(message.attachments !== undefined ? { attachments: branchGenerationAttachments } : {}),
     });
 
     yield* sendTurnForThread({
       threadId: event.payload.threadId,
       messageText: message.text,
-      ...(message.attachments !== undefined ? { attachments: resolvedAttachments } : {}),
+      ...(message.attachments !== undefined ? { attachments: message.attachments } : {}),
       ...(event.payload.model !== undefined ? { model: event.payload.model } : {}),
       ...(event.payload.effort !== undefined ? { effort: event.payload.effort } : {}),
       approvalPolicy: event.payload.approvalPolicy,