diff --git a/api/chalicelib/core/significance.py b/api/chalicelib/core/significance.py
index a38dc82d1..52a22aee8 100644
--- a/api/chalicelib/core/significance.py
+++ b/api/chalicelib/core/significance.py
@@ -213,8 +213,9 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]:
                 AND ISE.timestamp <= stages_t.stage{i + 1}_timestamp 
                 AND ISS.project_id=%(project_id)s
                 AND ISE.session_id = stages_t.session_id
+                AND ISS.type!='custom' -- ignore custom issues because they are massive
                 {"AND ISS.type IN %(issueTypes)s" if len(filter_issues) > 0 else ""}
-            LIMIT 20 -- remove the limit to get exact stats
+            LIMIT 50 -- remove the limit to get exact stats
         ) AS issues_t ON (TRUE)
     ) AS stages_and_issues_t INNER JOIN sessions USING(session_id);
     """
diff --git a/ee/api/chalicelib/core/significance.py b/ee/api/chalicelib/core/significance.py
index 75df1cd94..d2ad650b4 100644
--- a/ee/api/chalicelib/core/significance.py
+++ b/ee/api/chalicelib/core/significance.py
@@ -220,8 +220,9 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]:
                 AND ISE.timestamp <= stages_t.stage{i + 1}_timestamp 
                 AND ISS.project_id=%(project_id)s
                 AND ISE.session_id = stages_t.session_id
+                AND ISS.type!='custom' -- ignore custom issues because they are massive
                 {"AND ISS.type IN %(issueTypes)s" if len(filter_issues) > 0 else ""}
-            LIMIT 20 -- remove the limit to get exact stats
+            LIMIT 50 -- remove the limit to get exact stats
         ) AS issues_t ON (TRUE)
     ) AS stages_and_issues_t INNER JOIN sessions USING(session_id);
     """