diff --git a/changelogs/fragments/437.yml b/changelogs/fragments/437.yml
new file mode 100644
index 0000000..92a823e
--- /dev/null
+++ b/changelogs/fragments/437.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - grafana - Fix pgBackRest recovery window panel showing multiple values after a PostgreSQL switchover
diff --git a/grafana/postgres/PGBackrest.json b/grafana/postgres/PGBackrest.json
index ec7d140..78b3c09 100644
--- a/grafana/postgres/PGBackrest.json
+++ b/grafana/postgres/PGBackrest.json
@@ -83,7 +83,7 @@
             "uid": "${ccp_datasource}"
           },
           "exemplar": true,
-          "expr": "time()- ccp_backrest_oldest_full_backup_time_seconds{stanza=\"[[backrest_stanza]]\", repo=\"[[backrest_repo]]\"} + on(job,instance) group_left() (ccp_is_in_recovery_status == 2)",
+          "expr": "max(time()- ccp_backrest_oldest_full_backup_time_seconds{stanza=\"[[backrest_stanza]]\", repo=\"[[backrest_repo]]\"} + on(job,instance) group_left() (ccp_is_in_recovery_status == 2))",
           "interval": "",
           "legendFormat": "",
           "refId": "A"