diff --git a/modules/webhook/lambdas/webhook/src/webhook/handler.ts b/modules/webhook/lambdas/webhook/src/webhook/handler.ts
index 5f69abbd66..22f9f15a04 100644
--- a/modules/webhook/lambdas/webhook/src/webhook/handler.ts
+++ b/modules/webhook/lambdas/webhook/src/webhook/handler.ts
@@ -29,11 +29,6 @@ export async function handle(headers: IncomingHttpHeaders, body: string): Promis
     return response;
   }
 
-  const payload = JSON.parse(body);
-  LogFields.fields.event = githubEvent;
-  LogFields.fields.repository = payload.repository.full_name;
-  LogFields.fields.action = payload.action;
-
   if (!supportedEvents.includes(githubEvent)) {
     logger.warn(`Unsupported event type.`, LogFields.print());
     return {
@@ -42,6 +37,10 @@ export async function handle(headers: IncomingHttpHeaders, body: string): Promis
     };
   }
 
+  const payload = JSON.parse(body);
+  LogFields.fields.event = githubEvent;
+  LogFields.fields.repository = payload.repository.full_name;
+  LogFields.fields.action = payload.action;
   LogFields.fields.name = payload[githubEvent].name;
   LogFields.fields.status = payload[githubEvent].status;
   LogFields.fields.started_at = payload[githubEvent]?.started_at;