diff --git a/app/server.ts b/app/server.ts
index 68e409026921b275377cf716ed28d83a370fa51b..cf20f6574f56999ab64eacbd5dbd01d2190dc019 100644
--- a/app/server.ts
+++ b/app/server.ts
@@ -58,8 +58,14 @@ export type EventRequest = {
 
 const validateEventsRequestInput = (request: EventsRequest): FetchEventsInput => {
   logger.debug('validating request: ' + JSON.stringify(request))
+
+  let limit = request.limit ?? 5
+  if (limit > 50) {
+    limit = 50
+  }
+
   return {
-    limit: request.limit ?? 5,
+    limit: limit,
     offset: request.offset ?? 0,
     location: request.location,
     remoteOnly: request.remoteOnly,