=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2013-10-02 14:40:51 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2013-10-08 16:55:41 +0000
@@ -60,6 +60,8 @@
 public class JdbcEventAnalyticsManager
     implements EventAnalyticsManager
 {
+    private static final int MAX_LIMIT = 10000;
+    
     @Autowired
     private JdbcTemplate jdbcTemplate;
     
@@ -103,6 +105,10 @@
         {
             sql += "limit " + params.getLimit();
         }
+        else
+        {
+            sql += "limit " + MAX_LIMIT;
+        }
         
         // ---------------------------------------------------------------------
         // Grid