diff --git a/server/AyaNova/biz/EventLogProcessor.cs b/server/AyaNova/biz/EventLogProcessor.cs
index 0461b1e2..9befc0ed 100644
--- a/server/AyaNova/biz/EventLogProcessor.cs
+++ b/server/AyaNova/biz/EventLogProcessor.cs
@@ -49,13 +49,13 @@ namespace AyaNova.Biz
         {
             AyaNova.Api.Controllers.EventLogController.ObjectEventLog ret = new Api.Controllers.EventLogController.ObjectEventLog();
 
-            //Set up the query
-            var q = ct.Event.Select(m => m).AsNoTracking();
-
-            q = q.Where(m => m.AyId == opt.AyId);
-            q = q.OrderBy(m => m.Created);
             var limit = opt.Limit ?? DEFAULT_EVENT_LIMIT;
             var offset = opt.Offset ?? 0;
+
+            //Set up the query
+            var q = ct.Event.Select(m => m).Skip(offset).Take(limit).AsNoTracking();
+            q = q.Where(m => m.AyId == opt.AyId);
+            q = q.OrderBy(m => m.Created);
             q = q.Skip(offset).Take(limit);
 
             //Execute the query
@@ -89,17 +89,10 @@ namespace AyaNova.Biz
         {
 
             AyaNova.Api.Controllers.EventLogController.UserEventLog ret = new Api.Controllers.EventLogController.UserEventLog();
-
-            // var user = "johndoe";
-
-            // var blogs = context.Blogs
-            //     .FromSqlInterpolated($"EXECUTE dbo.GetMostPopularBlogsForUser {user}")
-            //     .ToList();
-            // var qLimitOffset = $"LIMIT {listOptions.Limit} OFFSET {listOptions.Offset}";
             var limit = opt.Limit ?? DEFAULT_EVENT_LIMIT;
             var offset = opt.Offset ?? 0;
             //Set up the query
-            var q = ct.Event.Select(m => m).Skip(offset).Take(limit);
+            var q = ct.Event.Select(m => m).Skip(offset).Take(limit).AsNoTracking();
             q = q.Where(m => m.UserId == opt.UserId);
             q = q.OrderBy(m => m.Created);