diff --git a/api/chalicelib/core/insights.py b/api/chalicelib/core/insights.py
index df9b5c5b7..13faf2111 100644
--- a/api/chalicelib/core/insights.py
+++ b/api/chalicelib/core/insights.py
@@ -52,14 +52,10 @@ def journey(project_id, startTimestamp=TimeUTC.now(delta_days=-1), endTimestamp=
     with pg_client.PostgresClient() as cur:
         pg_query = f"""SELECT source_event,
                                target_event,
-                               MAX(target_id)  max_target_id,
-                               MAX(source_id) max_source_id,
                                count(*) AS      value
                         
                         FROM (SELECT event_number || '_' || value as target_event,
-                                     message_id AS target_id,
-                                     LAG(event_number || '_' || value, 1) OVER ( PARTITION BY session_rank ) AS source_event,
-                                     LAG(message_id, 1) OVER ( PARTITION BY session_rank ) AS source_id
+                                     LAG(event_number || '_' || value, 1) OVER ( PARTITION BY session_rank ) AS source_event
                               FROM (SELECT value,
                                            session_rank,
                                            message_id,
diff --git a/ee/api/chalicelib/core/insights.py b/ee/api/chalicelib/core/insights.py
index f8277b84c..8a16aa98a 100644
--- a/ee/api/chalicelib/core/insights.py
+++ b/ee/api/chalicelib/core/insights.py
@@ -54,14 +54,10 @@ def journey(project_id, startTimestamp=TimeUTC.now(delta_days=-1), endTimestamp=
     with ch_client.ClickHouseClient() as ch:
         ch_query = f"""SELECT source_event,
                                target_event,
-                               MAX(target_id) max_target_id,
-                               MAX(source_id) max_source_id,
                                count(*) AS    value
-                        FROM (SELECT toString(event_number) || '_' || value                  as target_event,
-                                     toString(session_rank) || '_' || toString(event_number) AS target_id,
-                                     lagInFrame(toString(event_number) || '_' || value)         OVER (PARTITION BY session_rank ORDER BY datetime ASC ROWS
-                                         BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS source_event, lagInFrame(toString(session_rank) || '_' || toString(event_number)) OVER (PARTITION BY session_rank ORDER BY datetime ASC ROWS
-                                         BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS source_id
+                        FROM (SELECT toString(event_number) || '_' || value                   AS target_event,
+                                     lagInFrame(toString(event_number) || '_' || value) OVER (PARTITION BY session_rank ORDER BY datetime ASC ROWS
+                                         BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS source_event
                               FROM (SELECT session_rank,
                                            datetime,
                                            value,