diff --git a/src/services/api/handlers/getAttachmentUrl.ts b/src/services/api/handlers/getAttachmentUrl.ts
index 14d674573..ac4c7dc09 100644
--- a/src/services/api/handlers/getAttachmentUrl.ts
+++ b/src/services/api/handlers/getAttachmentUrl.ts
@@ -51,8 +51,8 @@ export const handler = async (event: APIGatewayEvent) => {
     const allAttachments = [
       ...(results.hits.hits[0]._source.attachments || []),
       ...Object.values(results.hits.hits[0]._source.rais).flatMap((entry) => [
-        ...(entry.request.attachments || []),
-        ...(entry.response.attachments || []),
+        ...(entry.request?.attachments || []),
+        ...(entry.response?.attachments || []),
       ]),
     ];