diff --git a/api/chalicelib/core/dashboard.py b/api/chalicelib/core/dashboard.py
index f90ebe275..959d84b34 100644
--- a/api/chalicelib/core/dashboard.py
+++ b/api/chalicelib/core/dashboard.py
@@ -2533,6 +2533,9 @@ def get_page_metrics_avg_first_contentful_pixel(project_id, startTimestamp=TimeU
         rows = __get_page_metrics_avg_first_contentful_pixel(cur, project_id, startTimestamp, endTimestamp, **args)
         if len(rows) > 0:
             results = helper.dict_to_camel_case(rows[0])
+        results["chart"] = __get_page_metrics_avg_first_contentful_pixel_chart(cur, project_id, startTimestamp,
+                                                                               endTimestamp, **args)
+
         diff = endTimestamp - startTimestamp
         endTimestamp = startTimestamp
         startTimestamp = endTimestamp - diff
@@ -2562,6 +2565,39 @@ def __get_page_metrics_avg_first_contentful_pixel(cur, project_id, startTimestam
     return rows
 
 
+def __get_page_metrics_avg_first_contentful_pixel_chart(cur, project_id, startTimestamp, endTimestamp, density=20,
+                                                        **args):
+    step_size = __get_step_size(endTimestamp=endTimestamp, startTimestamp=startTimestamp, density=density, factor=1)
+    params = {"step_size": step_size, "project_id": project_id, "startTimestamp": startTimestamp,
+              "endTimestamp": endTimestamp}
+    pg_sub_query_subset = __get_constraints(project_id=project_id, time_constraint=True,
+                                            chart=False, data=args)
+    pg_sub_query_chart = __get_constraints(project_id=project_id, time_constraint=False, project=False,
+                                           chart=True, data=args, main_table="pages", time_column="timestamp",
+                                           duration=False)
+    pg_sub_query_subset.append("pages.timestamp >= %(startTimestamp)s")
+    pg_sub_query_subset.append("pages.timestamp < %(endTimestamp)s")
+    pg_sub_query_subset.append("pages.first_contentful_paint_time > 0")
+
+    pg_query = f"""WITH pages AS(SELECT pages.first_contentful_paint_time, pages.timestamp
+                                    FROM events.pages INNER JOIN public.sessions USING (session_id)
+                                    WHERE {" AND ".join(pg_sub_query_subset)}
+                    )
+                    SELECT generated_timestamp AS timestamp,
+                         COALESCE(AVG(pages.first_contentful_paint_time),0) AS value
+                      FROM generate_series(%(startTimestamp)s, %(endTimestamp)s, %(step_size)s) AS generated_timestamp
+                        LEFT JOIN LATERAL (
+                                SELECT pages.first_contentful_paint_time
+                                FROM pages
+                                WHERE {" AND ".join(pg_sub_query_chart)}
+                        ) AS pages ON (TRUE)
+                      GROUP BY generated_timestamp
+                      ORDER BY generated_timestamp;"""
+    cur.execute(cur.mogrify(pg_query, {**params, **__get_constraint_values(args)}))
+    rows = cur.fetchall()
+    return rows
+
+
 def get_user_activity_avg_visited_pages(project_id, startTimestamp=TimeUTC.now(delta_days=-1),
                                         endTimestamp=TimeUTC.now(), **args):
     with pg_client.PostgresClient() as cur:
@@ -2760,7 +2796,7 @@ def get_top_metrics_avg_time_to_interactive(project_id, startTimestamp=TimeUTC.n
 
 
 def get_top_metrics_count_requests(project_id, startTimestamp=TimeUTC.now(delta_days=-1),
-                                   endTimestamp=TimeUTC.now(), value=None,density=20, **args):
+                                   endTimestamp=TimeUTC.now(), value=None, density=20, **args):
     step_size = __get_step_size(endTimestamp=endTimestamp, startTimestamp=startTimestamp, density=density, factor=1)
     params = {"step_size": step_size, "project_id": project_id, "startTimestamp": startTimestamp,
               "endTimestamp": endTimestamp}
@@ -2797,6 +2833,6 @@ def get_top_metrics_count_requests(project_id, startTimestamp=TimeUTC.now(delta_
                       ORDER BY generated_timestamp;"""
         cur.execute(cur.mogrify(pg_query, {**params, **__get_constraint_values(args)}))
         rows = cur.fetchall()
-        row["chart"]=rows
+        row["chart"] = rows
     row["unit"] = schemas.TemplatePredefinedUnits.count
     return helper.dict_to_camel_case(row)
diff --git a/ee/api/chalicelib/core/dashboard.py b/ee/api/chalicelib/core/dashboard.py
index 7d1da004e..0a314aa3f 100644
--- a/ee/api/chalicelib/core/dashboard.py
+++ b/ee/api/chalicelib/core/dashboard.py
@@ -2388,6 +2388,8 @@ def get_page_metrics_avg_first_contentful_pixel(project_id, startTimestamp=TimeU
         rows = __get_page_metrics_avg_first_contentful_pixel(ch, project_id, startTimestamp, endTimestamp, **args)
         if len(rows) > 0:
             results = helper.dict_to_camel_case(rows[0])
+        results["chart"] = __get_page_metrics_avg_first_contentful_pixel_chart(ch, project_id, startTimestamp,
+                                                                               endTimestamp, **args)
         diff = endTimestamp - startTimestamp
         endTimestamp = startTimestamp
         startTimestamp = endTimestamp - diff
@@ -2395,6 +2397,7 @@ def get_page_metrics_avg_first_contentful_pixel(project_id, startTimestamp=TimeU
         if len(rows) > 0:
             previous = helper.dict_to_camel_case(rows[0])
             results["progress"] = helper.__progress(old_val=previous["value"], new_val=results["value"])
+    results["unit"] = schemas.TemplatePredefinedUnits.millisecond
     return results
 
 
@@ -2413,6 +2416,29 @@ def __get_page_metrics_avg_first_contentful_pixel(ch, project_id, startTimestamp
     return rows
 
 
+def __get_page_metrics_avg_first_contentful_pixel_chart(ch, project_id, startTimestamp, endTimestamp, density=20,
+                                                        **args):
+    step_size = __get_step_size(endTimestamp=endTimestamp, startTimestamp=startTimestamp, density=density)
+    ch_sub_query_chart = __get_basic_constraints(table_name="pages", round_start=True, data=args)
+    meta_condition = __get_meta_constraint(args)
+    ch_sub_query_chart += meta_condition
+
+    params = {"step_size": step_size, "project_id": project_id, "startTimestamp": startTimestamp,
+              "endTimestamp": endTimestamp}
+
+    ch_query = f"""SELECT toUnixTimestamp(toStartOfInterval(pages.datetime, INTERVAL %(step_size)s second ))*1000 AS timestamp,
+                              COALESCE(AVG(NULLIF(pages.first_contentful_paint,0)),0) AS value 
+                  FROM pages {"INNER JOIN sessions_metadata USING(session_id)" if len(meta_condition) > 0 else ""}
+                  WHERE {" AND ".join(ch_sub_query_chart)}
+                  GROUP BY timestamp
+                  ORDER BY timestamp;"""
+    rows = ch.execute(query=ch_query, params={**params, **__get_constraint_values(args)})
+    rows = __complete_missing_steps(rows=rows, start_time=startTimestamp,
+                                    end_time=endTimestamp,
+                                    density=density, neutral={"value": 0})
+    return rows
+
+
 def get_user_activity_avg_visited_pages(project_id, startTimestamp=TimeUTC.now(delta_days=-1),
                                         endTimestamp=TimeUTC.now(), **args):
     results = {}