diff --git a/api/chalicelib/core/alerts_processor.py b/api/chalicelib/core/alerts_processor.py
index 5d51340b3..87599bbf3 100644
--- a/api/chalicelib/core/alerts_processor.py
+++ b/api/chalicelib/core/alerts_processor.py
@@ -103,6 +103,7 @@ def Build(a):
     params = {"project_id": a["projectId"], "now": now}
     full_args = {}
     j_s = True
+    main_table = ""
     if a["seriesId"] is not None:
         a["filter"]["sort"] = "session_id"
         a["filter"]["order"] = schemas.SortOrderType.desc
@@ -120,16 +121,16 @@ def Build(a):
                     WHERE project_id = %(project_id)s 
                         {"AND " + colDef["condition"] if colDef.get("condition") is not None else ""}"""
         j_s = colDef.get("joinSessions", True)
-
+        main_table = colDef["table"]
+    is_ss = main_table == "public.sessions"
     q = f"""SELECT coalesce(value,0) AS value, coalesce(value,0) {a["query"]["operator"]} {a["query"]["right"]} AS valid"""
 
     if a["detectionMethod"] == schemas.AlertDetectionMethod.threshold:
         if a["seriesId"] is not None:
             q += f""" FROM ({subQ}) AS stat"""
         else:
-            q += f""" FROM ({subQ} AND timestamp>=%(startDate)s AND timestamp<=%(now)s 
-                                {"AND sessions.start_ts >= %(startDate)s" if j_s else ""}
-                                {"AND sessions.start_ts <= %(now)s" if j_s else ""}) AS stat"""
+            q += f""" FROM ({subQ} {"AND timestamp >= % (startDate)s AND timestamp <= % (now)s" if is_ss else ""} 
+                                {"AND start_ts >= %(startDate)s AND start_ts <= %(now)s" if j_s else ""}) AS stat"""
         params = {**params, **full_args, "startDate": TimeUTC.now() - a["options"]["currentPeriod"] * 60 * 1000}
     else:
         if a["change"] == schemas.AlertDetectionType.change:
@@ -143,12 +144,10 @@ def Build(a):
             else:
                 sub1 = f"""{subQ} AND timestamp>=%(startDate)s 
                                   AND timestamp<=%(now)s
-                                {"AND sessions.start_ts >= %(startDate)s" if j_s else ""}
-                                {"AND sessions.start_ts <= %(now)s" if j_s else ""}"""
+                                {"AND start_ts >= %(startDate)s AND start_ts <= %(now)s" if j_s else ""}"""
                 params["startDate"] = TimeUTC.now() - a["options"]["currentPeriod"] * 60 * 1000
-                sub2 = f"""{subQ} AND timestamp<%(startDate)s 
-                                    AND timestamp>=%(timestamp_sub2)s
-                            {"AND sessions.start_ts < %(startDate)s AND sessions.start_ts >= %(timestamp_sub2)s" if j_s else ""}"""
+                sub2 = f"""{subQ} {"AND timestamp < % (startDate)s AND timestamp >= % (timestamp_sub2)s" if is_ss else ""}
+                            {"AND start_ts < %(startDate)s AND start_ts >= %(timestamp_sub2)s" if j_s else ""}"""
                 params["timestamp_sub2"] = TimeUTC.now() - 2 * a["options"]["currentPeriod"] * 60 * 1000
                 sub1 = f"SELECT (( {sub1} )-( {sub2} )) AS value"
                 q += f" FROM ( {sub1} ) AS stat"
@@ -164,13 +163,11 @@ def Build(a):
                                             - (a["options"]["currentPeriod"] + a["options"]["currentPeriod"]) \
                                             * 60 * 1000}
             else:
-                sub1 = f"""{subQ} AND timestamp>=%(startDate)s AND timestamp<=%(now)s
-                                {"AND sessions.start_ts >= %(startDate)s" if j_s else ""}
-                                {"AND sessions.start_ts <= %(now)s" if j_s else ""}"""
+                sub1 = f"""{subQ} {"AND timestamp >= % (startDate)s AND timestamp <= % (now)s" if is_ss else ""}
+                                {"AND start_ts >= %(startDate)s AND start_ts <= %(now)s" if j_s else ""}"""
                 params["startDate"] = TimeUTC.now() - a["options"]["currentPeriod"] * 60 * 1000
-                sub2 = f"""{subQ} AND timestamp<%(startDate)s
-                                AND timestamp>=%(timestamp_sub2)s
-                        {"AND sessions.start_ts < %(startDate)s AND sessions.start_ts >= %(timestamp_sub2)s" if j_s else ""}"""
+                sub2 = f"""{subQ} {"AND timestamp < % (startDate)s AND timestamp >= % (timestamp_sub2)s" if is_ss else ""}
+                        {"AND start_ts < %(startDate)s AND start_ts >= %(timestamp_sub2)s" if j_s else ""}"""
                 params["timestamp_sub2"] = TimeUTC.now() \
                                            - (a["options"]["currentPeriod"] + a["options"]["currentPeriod"]) * 60 * 1000
                 sub1 = f"SELECT (({sub1})/NULLIF(({sub2}),0)-1)*100 AS value"
diff --git a/ee/api/chalicelib/core/alerts_processor.py b/ee/api/chalicelib/core/alerts_processor.py
index 2ca38e32f..be7f10f89 100644
--- a/ee/api/chalicelib/core/alerts_processor.py
+++ b/ee/api/chalicelib/core/alerts_processor.py
@@ -108,6 +108,7 @@ def Build(a):
     params = {"project_id": a["projectId"], "now": now}
     full_args = {}
     j_s = True
+    main_table = ""
     if a["seriesId"] is not None:
         a["filter"]["sort"] = "session_id"
         a["filter"]["order"] = schemas.SortOrderType.desc
@@ -125,16 +126,16 @@ def Build(a):
                     WHERE project_id = %(project_id)s 
                         {"AND " + colDef["condition"] if colDef.get("condition") is not None else ""}"""
         j_s = colDef.get("joinSessions", True)
-
+        main_table = colDef["table"]
+    is_ss = main_table == "public.sessions"
     q = f"""SELECT coalesce(value,0) AS value, coalesce(value,0) {a["query"]["operator"]} {a["query"]["right"]} AS valid"""
 
     if a["detectionMethod"] == schemas.AlertDetectionMethod.threshold:
         if a["seriesId"] is not None:
             q += f""" FROM ({subQ}) AS stat"""
         else:
-            q += f""" FROM ({subQ} AND timestamp>=%(startDate)s AND timestamp<=%(now)s 
-                                {"AND sessions.start_ts >= %(startDate)s" if j_s else ""}
-                                {"AND sessions.start_ts <= %(now)s" if j_s else ""}) AS stat"""
+            q += f""" FROM ({subQ} {"AND timestamp >= % (startDate)s AND timestamp <= % (now)s" if is_ss else ""} 
+                                {"AND start_ts >= %(startDate)s AND start_ts <= %(now)s" if j_s else ""}) AS stat"""
         params = {**params, **full_args, "startDate": TimeUTC.now() - a["options"]["currentPeriod"] * 60 * 1000}
     else:
         if a["change"] == schemas.AlertDetectionType.change:
@@ -148,12 +149,10 @@ def Build(a):
             else:
                 sub1 = f"""{subQ} AND timestamp>=%(startDate)s 
                                   AND timestamp<=%(now)s
-                                {"AND sessions.start_ts >= %(startDate)s" if j_s else ""}
-                                {"AND sessions.start_ts <= %(now)s" if j_s else ""}"""
+                                {"AND start_ts >= %(startDate)s AND start_ts <= %(now)s" if j_s else ""}"""
                 params["startDate"] = TimeUTC.now() - a["options"]["currentPeriod"] * 60 * 1000
-                sub2 = f"""{subQ} AND timestamp<%(startDate)s 
-                                    AND timestamp>=%(timestamp_sub2)s
-                            {"AND sessions.start_ts < %(startDate)s AND sessions.start_ts >= %(timestamp_sub2)s" if j_s else ""}"""
+                sub2 = f"""{subQ} {"AND timestamp < % (startDate)s AND timestamp >= % (timestamp_sub2)s" if is_ss else ""}
+                            {"AND start_ts < %(startDate)s AND start_ts >= %(timestamp_sub2)s" if j_s else ""}"""
                 params["timestamp_sub2"] = TimeUTC.now() - 2 * a["options"]["currentPeriod"] * 60 * 1000
                 sub1 = f"SELECT (( {sub1} )-( {sub2} )) AS value"
                 q += f" FROM ( {sub1} ) AS stat"
@@ -169,13 +168,11 @@ def Build(a):
                                             - (a["options"]["currentPeriod"] + a["options"]["currentPeriod"]) \
                                             * 60 * 1000}
             else:
-                sub1 = f"""{subQ} AND timestamp>=%(startDate)s AND timestamp<=%(now)s
-                                {"AND sessions.start_ts >= %(startDate)s" if j_s else ""}
-                                {"AND sessions.start_ts <= %(now)s" if j_s else ""}"""
+                sub1 = f"""{subQ} {"AND timestamp >= % (startDate)s AND timestamp <= % (now)s" if is_ss else ""}
+                                {"AND start_ts >= %(startDate)s AND start_ts <= %(now)s" if j_s else ""}"""
                 params["startDate"] = TimeUTC.now() - a["options"]["currentPeriod"] * 60 * 1000
-                sub2 = f"""{subQ} AND timestamp<%(startDate)s
-                                AND timestamp>=%(timestamp_sub2)s
-                        {"AND sessions.start_ts < %(startDate)s AND sessions.start_ts >= %(timestamp_sub2)s" if j_s else ""}"""
+                sub2 = f"""{subQ} {"AND timestamp < % (startDate)s AND timestamp >= % (timestamp_sub2)s" if is_ss else ""}
+                        {"AND start_ts < %(startDate)s AND start_ts >= %(timestamp_sub2)s" if j_s else ""}"""
                 params["timestamp_sub2"] = TimeUTC.now() \
                                            - (a["options"]["currentPeriod"] + a["options"]["currentPeriod"]) * 60 * 1000
                 sub1 = f"SELECT (({sub1})/NULLIF(({sub2}),0)-1)*100 AS value"