diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb13f1562f2b..d76e8eab24aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,8 @@
 
 - [ENHANCEMENT] Update windows_exporter to v0.16.0 (@rfratto, @mattdurham)
 
+- [ENHANCEMENT] Add send latency to agent dashboard (@bboreham)
+
 - [BUGFIX] Do not immediately cancel context when creating a new trace
   processor. This was preventing scrape_configs in traces from
   functioning. (@lheinlen)
diff --git a/production/grafana-agent-mixin/dashboards.libsonnet b/production/grafana-agent-mixin/dashboards.libsonnet
index 1b3f57693ac2..264e5eabbb8f 100644
--- a/production/grafana-agent-mixin/dashboards.libsonnet
+++ b/production/grafana-agent-mixin/dashboards.libsonnet
@@ -101,21 +101,14 @@ local template = grafana.template;
           legendFormat='{{cluster}}:{{pod}}-{{instance_group_name}}-{{url}}',
         ));
 
-      local timestampComparisonRate =
+      local remoteSendLatency =
         graphPanel.new(
-          'Rate[5m]',
+          'P99 Latency [1m]',
           datasource='$datasource',
           span=6,
         )
         .addTarget(prometheus.target(
-          |||
-            (
-              rate(prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[5m])
-              -
-              ignoring(url, remote_name) group_right(pod)
-              rate(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[5m])
-            )
-          |||,
+          'histogram_quantile(0.99, rate(prometheus_remote_storage_sent_batch_duration_seconds_bucket{cluster=~"$cluster", namespace=~"$namespace", container=~"$container"}[1m]))',
           legendFormat='{{cluster}}:{{pod}}-{{instance_group_name}}-{{url}}',
         ));
 
@@ -341,7 +334,7 @@ local template = grafana.template;
       .addRow(
         row.new('Timestamps')
         .addPanel(timestampComparison)
-        .addPanel(timestampComparisonRate)
+        .addPanel(remoteSendLatency)
       )
       .addRow(
         row.new('Samples')