diff --git a/api/chalicelib/core/performance_event.py b/api/chalicelib/core/performance_event.py
index 194ab1895..ad55fb2d9 100644
--- a/api/chalicelib/core/performance_event.py
+++ b/api/chalicelib/core/performance_event.py
@@ -3,7 +3,8 @@ import schemas
 
 def get_col(perf: schemas.PerformanceEventType):
     return {
-        schemas.PerformanceEventType.location_dom_complete: "dom_building_time",
-        schemas.PerformanceEventType.ttfb: "ttfb",
+        schemas.PerformanceEventType.location_dom_complete: {"column": "dom_building_time", "extraJoin": None},
+        schemas.PerformanceEventType.location_ttfb: {"column": "ttfb", "extraJoin": None},
+        schemas.PerformanceEventType.location_avg_cpu_load: {"column": "avg_cpu", "extraJoin": "events.performance"},
         # schemas.PerformanceEventType.location_largest_contentful_paint_time: "timestamp"
     }.get(perf)
diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py
index 183bdd242..e086ab099 100644
--- a/api/chalicelib/core/sessions.py
+++ b/api/chalicelib/core/sessions.py
@@ -442,19 +442,28 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f
                                                  event.value, value_key=e_k))
                 elif event_type in [schemas.PerformanceEventType.location_dom_complete,
                                     schemas.PerformanceEventType.location_largest_contentful_paint_time,
-                                    schemas.PerformanceEventType.ttfb]:
+                                    schemas.PerformanceEventType.location_ttfb,
+                                    schemas.PerformanceEventType.location_avg_cpu_load
+                                    ]:
                     event_from = event_from % f"{events.event_type.LOCATION.table} AS main "
+                    col = performance_event.get_col(event_type)
+                    colname = col["column"]
+                    tname = "main"
+                    if col.get("extraJoin") is not None:
+                        tname = "ej"
+                        event_from += f" INNER JOIN {col['extraJoin']} AS {tname} USING(session_id)"
+                        event_where += [f"{tname}.timestamp >= main.timestamp", f"{tname}.timestamp >= %(startDate)s",
+                                        f"{tname}.timestamp <= %(endDate)s"]
                     if not is_any:
                         event_where.append(
                             _multiple_conditions(f"main.{events.event_type.LOCATION.column} {op} %({e_k})s",
                                                  event.value, value_key=e_k))
                     e_k += "_custom"
                     full_args = {**full_args, **_multiple_values(event.custom, value_key=e_k)}
-                    colname=performance_event.get_col(event_type)
-                    event_where.append(
-                        _multiple_conditions(
-                            f"main.{colname} {event.customOperator} %({e_k})s AND {colname} IS NOT NULL AND {colname}>0",
-                            event.custom, value_key=e_k))
+
+                    event_where.append(f"{tname}.{colname} IS NOT NULL AND {tname}.{colname}>0 AND " +
+                                       _multiple_conditions(f"{tname}.{colname} {event.customOperator} %({e_k})s",
+                                                            event.custom, value_key=e_k))
                 elif event_type == schemas.PerformanceEventType.time_between_events:
                     event_from = event_from % f"{getattr(events.event_type, event.value[0].type).table} AS main INNER JOIN {getattr(events.event_type, event.value[1].type).table} AS main2 USING(session_id) "
                     if not isinstance(event.value[0].value, list):
diff --git a/api/schemas.py b/api/schemas.py
index 72eb4f65b..aabfad967 100644
--- a/api/schemas.py
+++ b/api/schemas.py
@@ -372,7 +372,8 @@ class PerformanceEventType(str, Enum):
     location_dom_complete = "DOM_COMPLETE"
     location_largest_contentful_paint_time = "LARGEST_CONTENTFUL_PAINT_TIME"
     time_between_events = "TIME_BETWEEN_EVENTS"
-    ttfb = "TTFB"
+    location_ttfb = "TTFB"
+    location_avg_cpu_load = "AVG_CPU_LOAD"
 
 
 class FilterType(str, Enum):