diff --git a/src/app/api/documents/[id]/parsed/route.ts b/src/app/api/documents/[id]/parsed/route.ts
index b2ad9c4..23580ae 100644
--- a/src/app/api/documents/[id]/parsed/route.ts
+++ b/src/app/api/documents/[id]/parsed/route.ts
@@ -3,7 +3,12 @@ import { and, eq, inArray } from 'drizzle-orm';
 import { db } from '@/db';
 import { documents } from '@/db/schema';
 import { requireAuthContext } from '@/lib/server/auth/auth';
-import { getParsedDocumentBlob, isMissingBlobError, isValidDocumentId } from '@/lib/server/documents/blobstore';
+import {
+  getParsedDocumentBlob,
+  getParsedDocumentBlobByKey,
+  isMissingBlobError,
+  isValidDocumentId,
+} from '@/lib/server/documents/blobstore';
 import { enqueueParsePdfJob } from '@/lib/server/jobs/parsePdfJob';
 import { getOpenReaderTestNamespace, getUnclaimedUserIdForNamespace } from '@/lib/server/testing/test-namespace';
 import { isS3Configured } from '@/lib/server/storage/s3';
@@ -56,12 +61,14 @@ export async function GET(req: NextRequest, ctx: { params: Promise<{ id: string
         id: documents.id,
         userId: documents.userId,
         parseStatus: documents.parseStatus,
+        parsedJsonKey: documents.parsedJsonKey,
       })
       .from(documents)
       .where(and(eq(documents.id, id), inArray(documents.userId, allowedUserIds)))) as Array<{
       id: string;
       userId: string;
       parseStatus: string | null;
+      parsedJsonKey: string | null;
     }>;
 
     const row = rows.find((candidate) => candidate.userId === storageUserId) ?? rows[0];
@@ -97,7 +104,7 @@ export async function GET(req: NextRequest, ctx: { params: Promise<{ id: string
     }
 
     if (effectiveStatus !== 'ready') {
-      if (effectiveStatus === 'pending' || effectiveStatus === 'running') {
+      if (effectiveStatus === 'pending') {
         enqueueParsePdfJob({
           documentId: id,
           userId: row.userId,
@@ -108,7 +115,9 @@ export async function GET(req: NextRequest, ctx: { params: Promise<{ id: string
     }
 
     try {
-      const json = await getParsedDocumentBlob(id, testNamespace);
+      const json = row.parsedJsonKey?.trim()
+        ? await getParsedDocumentBlobByKey(row.parsedJsonKey)
+        : await getParsedDocumentBlob(id, testNamespace);
       let parsedDoc: ParsedPdfDocument | null = null;
       try {
         parsedDoc = JSON.parse(Buffer.from(json).toString('utf8')) as ParsedPdfDocument;
@@ -117,16 +126,11 @@ export async function GET(req: NextRequest, ctx: { params: Promise<{ id: string
       }
 
       if (!hasAnyParsedBlocks(parsedDoc)) {
-        await db
-          .update(documents)
-          .set({ parseStatus: 'pending' })
-          .where(and(eq(documents.id, id), eq(documents.userId, row.userId)));
-        enqueueParsePdfJob({
+        console.warn('[documents/parsed] parsed doc has no blocks', {
           documentId: id,
           userId: row.userId,
-          namespace: testNamespace,
+          parsedJsonKey: row.parsedJsonKey,
         });
-        return NextResponse.json({ parseStatus: 'pending' }, { status: 202 });
       }
 
       return new NextResponse(new Uint8Array(json), {
@@ -171,12 +175,14 @@ export async function POST(req: NextRequest, ctx: { params: Promise<{ id: string
         id: documents.id,
         userId: documents.userId,
         parseStatus: documents.parseStatus,
+        parsedJsonKey: documents.parsedJsonKey,
       })
       .from(documents)
       .where(and(eq(documents.id, id), inArray(documents.userId, allowedUserIds)))) as Array<{
       id: string;
       userId: string;
       parseStatus: string | null;
+      parsedJsonKey: string | null;
     }>;
 
     const row = rows.find((candidate) => candidate.userId === storageUserId) ?? rows[0];
diff --git a/src/lib/server/compute/worker.ts b/src/lib/server/compute/worker.ts
index a2ae17f..500ad6f 100644
--- a/src/lib/server/compute/worker.ts
+++ b/src/lib/server/compute/worker.ts
@@ -19,7 +19,7 @@ class WorkerHttpError extends Error {
   }
 }
 
-const DEFAULT_WAIT_TIMEOUT_MS = 45_000;
+const DEFAULT_WAIT_TIMEOUT_MS = 120_000;
 const DEFAULT_RETRIES = 2;
 const POLL_INTERVAL_MS = 400;
 const POLL_MAX_INTERVAL_MS = 1_500;
diff --git a/src/lib/server/documents/blobstore.ts b/src/lib/server/documents/blobstore.ts
index d94d9f2..41aa97a 100644
--- a/src/lib/server/documents/blobstore.ts
+++ b/src/lib/server/documents/blobstore.ts
@@ -224,6 +224,20 @@ export async function getParsedDocumentBlob(id: string, namespace: string | null
   return bodyToBuffer(res.Body);
 }
 
+export async function getParsedDocumentBlobByKey(key: string): Promise<Buffer> {
+  const cfg = getS3Config();
+  const client = getS3ProxyClient();
+  const trimmed = key.trim();
+  if (!trimmed) throw new Error('Parsed document key is empty');
+  const res = await client.send(
+    new GetObjectCommand({
+      Bucket: cfg.bucket,
+      Key: trimmed,
+    }),
+  );
+  return bodyToBuffer(res.Body);
+}
+
 export async function putParsedDocumentBlob(id: string, body: Buffer, namespace: string | null): Promise<string> {
   const cfg = getS3Config();
   const client = getS3ProxyClient();