diff --git a/backend/pkg/db/postgres/alert.go b/backend/pkg/db/postgres/alert.go
index b9722911a..999e1d29b 100644
--- a/backend/pkg/db/postgres/alert.go
+++ b/backend/pkg/db/postgres/alert.go
@@ -106,22 +106,22 @@ type columnDefinition struct {
 }
 
 var LeftToDb = map[string]columnDefinition{
-	"performance.dom_content_loaded.average":     {table: "events.pages", formula: "COALESCE(AVG(NULLIF(dom_content_loaded_time ,0)),0)"},
-	"performance.first_meaningful_paint.average": {table: "events.pages", formula: "COALESCE(AVG(NULLIF(first_contentful_paint_time,0)),0)"},
-	"performance.page_load_time.average":         {table: "events.pages", formula: "AVG(NULLIF(load_time ,0))"},
-	"performance.dom_build_time.average":         {table: "events.pages", formula: "AVG(NULLIF(dom_building_time,0))"},
-	"performance.speed_index.average":            {table: "events.pages", formula: "AVG(NULLIF(speed_index,0))"},
-	"performance.page_response_time.average":     {table: "events.pages", formula: "AVG(NULLIF(response_time,0))"},
-	"performance.ttfb.average":                   {table: "events.pages", formula: "AVG(NULLIF(first_paint_time,0))"},
-	"performance.time_to_render.averag":          {table: "events.pages", formula: "AVG(NULLIF(visually_complete,0))"},
-	"performance.image_load_time.average":        {table: "events.resources", formula: "AVG(NULLIF(duration,0))", condition: "type='img'"},
-	"performance.request_load_time.average":      {table: "events.resources", formula: "AVG(NULLIF(duration,0))", condition: "type='fetch'"},
-	"resources.load_time.average":                {table: "events.resources", formula: "AVG(NULLIF(duration,0))"},
-	"resources.missing.count":                    {table: "events.resources", formula: "COUNT(DISTINCT url_hostpath)", condition: "success=0"},
-	"errors.4xx_5xx.count":                       {table: "events.resources", formula: "COUNT(session_id)", condition: "status/100!=2"},
-	"errors.4xx.count":                           {table: "events.resources", formula: "COUNT(session_id)", condition: "status/100=4"},
-	"errors.5xx.count":                           {table: "events.resources", formula: "COUNT(session_id)", condition: "status/100=5"},
-	"errors.javascript.impacted_sessions.count":  {table: "events.resources", formula: "COUNT(DISTINCT session_id)", condition: "success= FALSE AND type='script'"},
+	"performance.dom_content_loaded.average":     {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "COALESCE(AVG(NULLIF(dom_content_loaded_time ,0)),0)"},
+	"performance.first_meaningful_paint.average": {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "COALESCE(AVG(NULLIF(first_contentful_paint_time,0)),0)"},
+	"performance.page_load_time.average":         {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(load_time ,0))"},
+	"performance.dom_build_time.average":         {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(dom_building_time,0))"},
+	"performance.speed_index.average":            {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(speed_index,0))"},
+	"performance.page_response_time.average":     {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(response_time,0))"},
+	"performance.ttfb.average":                   {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(first_paint_time,0))"},
+	"performance.time_to_render.averag":          {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(visually_complete,0))"},
+	"performance.image_load_time.average":        {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(duration,0))", condition: "type='img'"},
+	"performance.request_load_time.average":      {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(duration,0))", condition: "type='fetch'"},
+	"resources.load_time.average":                {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(duration,0))"},
+	"resources.missing.count":                    {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(DISTINCT url_hostpath)", condition: "success=0"},
+	"errors.4xx_5xx.count":                       {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(session_id)", condition: "status/100!=2"},
+	"errors.4xx.count":                           {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(session_id)", condition: "status/100=4"},
+	"errors.5xx.count":                           {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(session_id)", condition: "status/100=5"},
+	"errors.javascript.impacted_sessions.count":  {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(DISTINCT session_id)", condition: "success= FALSE AND type='script'"},
 	"performance.crashes.count":                  {table: "public.sessions", formula: "COUNT(DISTINCT session_id)", condition: "errors_count > 0"},
 	"errors.javascript.count":                    {table: "events.errors INNER JOIN public.errors AS m_errors USING (error_id)", formula: "COUNT(DISTINCT session_id)", condition: "source='js_exception'"},
 	"errors.backend.count":                       {table: "events.errors INNER JOIN public.errors AS m_errors USING (error_id)", formula: "COUNT(DISTINCT session_id)", condition: "source!='js_exception'"},
diff --git a/ee/backend/pkg/db/postgres/alert.go b/ee/backend/pkg/db/postgres/alert.go
index f3a2ed51f..5977def15 100644
--- a/ee/backend/pkg/db/postgres/alert.go
+++ b/ee/backend/pkg/db/postgres/alert.go
@@ -106,22 +106,22 @@ type columnDefinition struct {
 }
 
 var LeftToDb = map[string]columnDefinition{
-	"performance.dom_content_loaded.average":     {table: "events.pages", formula: "COALESCE(AVG(NULLIF(dom_content_loaded_time ,0)),0)"},
-	"performance.first_meaningful_paint.average": {table: "events.pages", formula: "COALESCE(AVG(NULLIF(first_contentful_paint_time,0)),0)"},
-	"performance.page_load_time.average":         {table: "events.pages", formula: "AVG(NULLIF(load_time ,0))"},
-	"performance.dom_build_time.average":         {table: "events.pages", formula: "AVG(NULLIF(dom_building_time,0))"},
-	"performance.speed_index.average":            {table: "events.pages", formula: "AVG(NULLIF(speed_index,0))"},
-	"performance.page_response_time.average":     {table: "events.pages", formula: "AVG(NULLIF(response_time,0))"},
-	"performance.ttfb.average":                   {table: "events.pages", formula: "AVG(NULLIF(first_paint_time,0))"},
-	"performance.time_to_render.averag":          {table: "events.pages", formula: "AVG(NULLIF(visually_complete,0))"},
-	"performance.image_load_time.average":        {table: "events.resources", formula: "AVG(NULLIF(duration,0))", condition: "type='img'"},
-	"performance.request_load_time.average":      {table: "events.resources", formula: "AVG(NULLIF(duration,0))", condition: "type='fetch'"},
-	"resources.load_time.average":                {table: "events.resources", formula: "AVG(NULLIF(duration,0))"},
-	"resources.missing.count":                    {table: "events.resources", formula: "COUNT(DISTINCT url_hostpath)", condition: "success=0"},
-	"errors.4xx_5xx.count":                       {table: "events.resources", formula: "COUNT(session_id)", condition: "status/100!=2"},
-	"errors.4xx.count":                           {table: "events.resources", formula: "COUNT(session_id)", condition: "status/100=4"},
-	"errors.5xx.count":                           {table: "events.resources", formula: "COUNT(session_id)", condition: "status/100=5"},
-	"errors.javascript.impacted_sessions.count":  {table: "events.resources", formula: "COUNT(DISTINCT session_id)", condition: "success= FALSE AND type='script'"},
+	"performance.dom_content_loaded.average":     {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "COALESCE(AVG(NULLIF(dom_content_loaded_time ,0)),0)"},
+	"performance.first_meaningful_paint.average": {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "COALESCE(AVG(NULLIF(first_contentful_paint_time,0)),0)"},
+	"performance.page_load_time.average":         {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(load_time ,0))"},
+	"performance.dom_build_time.average":         {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(dom_building_time,0))"},
+	"performance.speed_index.average":            {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(speed_index,0))"},
+	"performance.page_response_time.average":     {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(response_time,0))"},
+	"performance.ttfb.average":                   {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(first_paint_time,0))"},
+	"performance.time_to_render.averag":          {table: "events.pages INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(visually_complete,0))"},
+	"performance.image_load_time.average":        {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(duration,0))", condition: "type='img'"},
+	"performance.request_load_time.average":      {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(duration,0))", condition: "type='fetch'"},
+	"resources.load_time.average":                {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "AVG(NULLIF(duration,0))"},
+	"resources.missing.count":                    {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(DISTINCT url_hostpath)", condition: "success=0"},
+	"errors.4xx_5xx.count":                       {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(session_id)", condition: "status/100!=2"},
+	"errors.4xx.count":                           {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(session_id)", condition: "status/100=4"},
+	"errors.5xx.count":                           {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(session_id)", condition: "status/100=5"},
+	"errors.javascript.impacted_sessions.count":  {table: "events.resources INNER JOIN public.sessions USING(session_id)", formula: "COUNT(DISTINCT session_id)", condition: "success= FALSE AND type='script'"},
 	"performance.crashes.count":                  {table: "public.sessions", formula: "COUNT(DISTINCT session_id)", condition: "errors_count > 0"},
 	"errors.javascript.count":                    {table: "events.errors INNER JOIN public.errors AS m_errors USING (error_id)", formula: "COUNT(DISTINCT session_id)", condition: "source='js_exception'"},
 	"errors.backend.count":                       {table: "events.errors INNER JOIN public.errors AS m_errors USING (error_id)", formula: "COUNT(DISTINCT session_id)", condition: "source!='js_exception'"},