diff --git a/apps/webapp/app/routes/api.v1.events.$eventId.ts b/apps/webapp/app/routes/api.v1.events.$eventId.ts
index f1bb0e7aa..ea4b206fe 100644
--- a/apps/webapp/app/routes/api.v1.events.$eventId.ts
+++ b/apps/webapp/app/routes/api.v1.events.$eventId.ts
@@ -25,7 +25,16 @@ export async function loader({ request, params }: LoaderArgs) {
     );
   }
 
-  const { eventId } = ParamsSchema.parse(params);
+  const parsed = ParamsSchema.safeParse(params);
+
+  if (!parsed.success) {
+    return apiCors(
+      request,
+      json({ error: "Invalid or Missing eventId" }, { status: 400 })
+    );
+  }
+
+  const { eventId } = parsed.data;
 
   const event = await prisma.eventRecord.findUnique({
     select: {
@@ -47,5 +56,12 @@ export async function loader({ request, params }: LoaderArgs) {
     },
   });
 
+  if (!event) {
+    return apiCors(
+      request,
+      json({ error: "Event not found" }, { status: 404 })
+    );
+  }
+
   return apiCors(request, json(event));
 }