diff --git a/scripts/agent/validate-events.mjs b/scripts/agent/validate-events.mjs
index 0f68d1c1..14f7cc70 100644
--- a/scripts/agent/validate-events.mjs
+++ b/scripts/agent/validate-events.mjs
@@ -104,10 +104,8 @@ function validateEvent(type, event) {
   if (schema.content) {
     if (schema.content.format === "json") {
       try {
-        JSON.parse(event.content);
-        // TODO: Validate JSON schema fields if defined (schema.content.fields)
+        const parsed = JSON.parse(event.content);
         if (schema.content.fields) {
-            const parsed = JSON.parse(event.content);
             schema.content.fields.forEach(field => {
                 if (field.required && parsed[field.key] === undefined) {
                     errors.push(`Missing required content field: ${field.key}`);