diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs
index d82ea6392..4ac2fd441 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs
@@ -85,9 +85,13 @@ namespace Orchard.AuditTrail.Services {
 
             var totalItemCount = query.Count();
             var startIndex = (page - 1) * pageSize;
-            var records = query.Skip(startIndex).Take(pageSize);
 
-            return new PageOfItems<AuditTrailEventRecord>(records) {
+            query = query.Skip(startIndex);
+
+            if (pageSize > 0)
+                query = query.Take(pageSize);
+
+            return new PageOfItems<AuditTrailEventRecord>(query) {
                 PageNumber = page,
                 PageSize = pageSize,
                 TotalItemCount = totalItemCount