diff --git a/.changelog/9487.txt b/.changelog/9487.txt
new file mode 100644
index 000000000000..4c3c7b017ec6
--- /dev/null
+++ b/.changelog/9487.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+rpc: Prevent misleading RPC error claiming the lack of a leader when Raft is ok but there are issues with client agents gossiping with the leader.
+```