diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py
index c6e1a7efd..1903cc08b 100644
--- a/api/chalicelib/core/sessions.py
+++ b/api/chalicelib/core/sessions.py
@@ -385,6 +385,19 @@ def search2_series(data: schemas.SessionsSearchPayloadSchema, project_id: int, d
         return sessions
 
 
+def __is_valid_event(is_any: bool, event: schemas._SessionSearchEventSchema):
+    return not (not is_any and len(event.value) == 0 and event.type not in [schemas.EventType.request_details,
+                                                                            schemas.EventType.graphql_details] \
+                or event.type in [schemas.PerformanceEventType.location_dom_complete,
+                                  schemas.PerformanceEventType.location_largest_contentful_paint_time,
+                                  schemas.PerformanceEventType.location_ttfb,
+                                  schemas.PerformanceEventType.location_avg_cpu_load,
+                                  schemas.PerformanceEventType.location_avg_memory_usage
+                                  ] and (event.source is None or len(event.source) == 0) \
+                or event.type in [schemas.EventType.request_details, schemas.EventType.graphql_details] and (
+                        event.filters is None or len(event.filters) == 0))
+
+
 def search_query_parts(data, error_status, errors_only, favorite_only, issue, project_id, user_id, extra_event=None):
     ss_constraints = []
     full_args = {"project_id": project_id, "startDate": data.startDate, "endDate": data.endDate,
@@ -600,6 +613,13 @@ def search_query_parts(data, error_status, errors_only, favorite_only, issue, pr
                                          value_key=f_k))
     # ---------------------------------------------------------------------------
     if len(data.events) > 0:
+        valid_events_count = 0
+        for event in data.events:
+            is_any = _isAny_opreator(event.operator)
+            if not isinstance(event.value, list):
+                event.value = [event.value]
+            if __is_valid_event(is_any=is_any, event=event):
+                valid_events_count += 1
         events_query_from = []
         event_index = 0
         or_events = data.events_order == schemas.SearchEventOrder._or
@@ -610,16 +630,7 @@ def search_query_parts(data, error_status, errors_only, favorite_only, issue, pr
             is_any = _isAny_opreator(event.operator)
             if not isinstance(event.value, list):
                 event.value = [event.value]
-            if not is_any and len(event.value) == 0 and event_type not in [schemas.EventType.request_details,
-                                                                           schemas.EventType.graphql_details] \
-                    or event_type in [schemas.PerformanceEventType.location_dom_complete,
-                                      schemas.PerformanceEventType.location_largest_contentful_paint_time,
-                                      schemas.PerformanceEventType.location_ttfb,
-                                      schemas.PerformanceEventType.location_avg_cpu_load,
-                                      schemas.PerformanceEventType.location_avg_memory_usage
-                                      ] and (event.source is None or len(event.source) == 0) \
-                    or event_type in [schemas.EventType.request_details, schemas.EventType.graphql_details] and (
-                    event.filters is None or len(event.filters) == 0):
+            if not __is_valid_event(is_any=is_any, event=event):
                 continue
             op = __get_sql_operator(event.operator)
             is_not = False
@@ -938,7 +949,7 @@ def search_query_parts(data, error_status, errors_only, favorite_only, issue, pr
             """)
             else:
                 events_query_from.append(f"""\
-            (SELECT main.session_id, MIN(main.timestamp) AS timestamp
+            (SELECT main.session_id, {"MIN" if event_index < (valid_events_count - 1) else "MAX"}(main.timestamp) AS timestamp
               FROM {event_from}
               WHERE {" AND ".join(event_where)}
               GROUP BY 1