diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFile/CaseFile.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFile/CaseFile.tsx
index e86149181923..8170d9b93f44 100644
--- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFile/CaseFile.tsx
+++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/CaseFile/CaseFile.tsx
@@ -16,7 +16,10 @@ import {
   PdfButton,
   ProsecutorCaseInfo,
 } from '@island.is/judicial-system-web/src/components'
-import { CaseFileCategory } from '@island.is/judicial-system-web/src/graphql/schema'
+import {
+  CaseFile as TCaseFile,
+  CaseFileCategory,
+} from '@island.is/judicial-system-web/src/graphql/schema'
 
 import { caseFile as m } from './CaseFile.strings'
 
@@ -25,12 +28,17 @@ const CaseFile = () => {
     useContext(FormContext)
 
   const caseFiles = useMemo(() => {
-    return (
-      workingCase.caseFiles?.filter(
-        (caseFile) => caseFile.category === CaseFileCategory.CASE_FILE_RECORD,
-      ) ?? []
+    return new Map<string, TCaseFile[]>(
+      workingCase.policeCaseNumbers?.map((policeCaseNumber) => [
+        policeCaseNumber,
+        workingCase.caseFiles?.filter(
+          (caseFile) =>
+            caseFile.policeCaseNumber === policeCaseNumber &&
+            caseFile.category === CaseFileCategory.CASE_FILE_RECORD,
+        ) ?? [],
+      ]),
     )
-  }, [workingCase.caseFiles])
+  }, [workingCase.caseFiles, workingCase.policeCaseNumbers])
 
   const { formatMessage } = useIntl()
   const [editCount, setEditCount] = useState<number>(0)
@@ -73,7 +81,7 @@ const CaseFile = () => {
                     caseId={workingCase.id}
                     policeCaseNumber={policeCaseNumber}
                     shouldStartExpanded={index === 0}
-                    caseFiles={caseFiles}
+                    caseFiles={caseFiles.get(policeCaseNumber) ?? []}
                     subtypes={workingCase.indictmentSubtypes}
                     crimeScenes={workingCase.crimeScenes}
                     setEditCount={setEditCount}