diff --git a/.changeset/fair-carrots-trade.md b/.changeset/fair-carrots-trade.md
new file mode 100644
index 000000000000..15965d726f3f
--- /dev/null
+++ b/.changeset/fair-carrots-trade.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Fixes "Average first response time" and "Best first response time" metrics being associated to the last agent who served the room (instead of the first one)