diff --git a/src/config/DefaultDI.ts b/src/config/DefaultDI.ts
index 952b368..97e5a25 100644
--- a/src/config/DefaultDI.ts
+++ b/src/config/DefaultDI.ts
@@ -502,6 +502,7 @@ export const DefaultDI = () => {
     createStorage("form_8k_events", Form8KEventSchema, Form8KEventPrimaryKeyNames, [
       ["cik", "filing_date"],
       ["item_code"],
+      ["cik", "accession_number"],
     ])
   );
 };
diff --git a/src/config/TestingDI.ts b/src/config/TestingDI.ts
index 5c5e6c0..0bed65a 100644
--- a/src/config/TestingDI.ts
+++ b/src/config/TestingDI.ts
@@ -444,6 +444,7 @@ export function resetDependencyInjectionsForTesting() {
     new InMemoryTabularStorage(Form8KEventSchema, Form8KEventPrimaryKeyNames, [
       ["cik", "filing_date"],
       ["item_code"],
+      ["cik", "accession_number"],
     ])
   );
 }
diff --git a/src/task/forms/ProcessAccessionDocFormTask.ts b/src/task/forms/ProcessAccessionDocFormTask.ts
index 65802e2..691e0ea 100644
--- a/src/task/forms/ProcessAccessionDocFormTask.ts
+++ b/src/task/forms/ProcessAccessionDocFormTask.ts
@@ -85,19 +85,17 @@ export class ProcessAccessionDocFormTask extends Task<
     let items: string | null | undefined;
     let report_date: string | null | undefined;
 
-    if (!cik || !form || !fileName) {
-      const filingRepo = globalServiceRegistry.get(FILING_REPOSITORY_TOKEN);
-      const filings = await filingRepo.query({ accession_number: accessionNumber });
-      const filing = filings?.[0];
-      if (!filing) throw new TaskError("Filing not found");
-      cik = filing.cik;
-      form = filing.form ?? undefined;
-      filing_date = filing.filing_date;
-      file_number = filing.file_number;
-      items = filing.items;
-      report_date = filing.report_date;
-      fileName = fileName ?? filing.primary_doc;
-    }
+    const filingRepo = globalServiceRegistry.get(FILING_REPOSITORY_TOKEN);
+    const filings = await filingRepo.query({ accession_number: accessionNumber });
+    const filing = filings?.[0];
+    if (!filing) throw new TaskError("Filing not found");
+    if (!cik) cik = filing.cik;
+    if (!form) form = filing.form ?? undefined;
+    filing_date = filing.filing_date;
+    file_number = filing.file_number;
+    items = filing.items;
+    report_date = filing.report_date;
+    if (!fileName) fileName = filing.primary_doc;
 
     if (!form) {
       throw new TaskError(`Filing ${accessionNumber} has no form type`);