diff --git a/server/src/event/event.service.ts b/server/src/event/event.service.ts
index 14106f87..d7e8d230 100644
--- a/server/src/event/event.service.ts
+++ b/server/src/event/event.service.ts
@@ -158,9 +158,11 @@ export class EventService {
 
     const closestChallenge = await this.prisma.challenge.findFirstOrThrow({
       where: {
-        eventIndex: 0,
         linkedEvent: { id: event.id },
       },
+      orderBy: {
+        eventIndex: 'asc',
+      },
     });
 
     const progress = await this.prisma.eventTracker.create({