diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md
index 3d4703ccc96e..d345dab8d039 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG-3.3.md
@@ -17,6 +17,10 @@ The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.
 
 - Fix [`etcdctl member add`](https://github.com/etcd-io/etcd/pull/11638) command to prevent potential timeout.
 
+### gRPC Proxy
+
+- Fix [`panic on error`](https://github.com/etcd-io/etcd/pull/11694) for metrics handler. 
+
 <hr>
 
 ## v3.3.18 (2019-11-26)
diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
index 25e28d1a845d..23b9c5694f2d 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG-3.4.md
@@ -19,6 +19,9 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.4...v3.4.5) and
 
 - Fix [`etcdctl member add`](https://github.com/etcd-io/etcd/pull/11638) command to prevent potential timeout.
 
+### gRPC Proxy
+ 
+- Fix [`panic on error`](https://github.com/etcd-io/etcd/pull/11694) for metrics handler.
 
 <hr>
 
diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
index 5543784e9c46..3d1497daf8ff 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG-3.5.md
@@ -106,6 +106,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
 - Fix [IPv6 endpoint parsing in client](https://github.com/etcd-io/etcd/pull/11211).
   - Fix ["1.16: etcd client does not parse IPv6 addresses correctly when members are joining" (kubernetes#83550)](https://github.com/kubernetes/kubernetes/issues/83550).
 - Use [ServerName as the authority](https://github.com/etcd-io/etcd/pull/11574) after bumping to grpc v1.26.0. Remove workaround in [#11184](https://github.com/etcd-io/etcd/pull/11184).
+
 ### etcdctl v3
 
 - Fix `etcdctl member add` command to prevent potential timeout. ([PR#11194](https://github.com/etcd-io/etcd/pull/11194) and [PR#11638](https://github.com/etcd-io/etcd/pull/11638))
@@ -118,6 +119,10 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
   - Deprecated [`/v3beta`](https://github.com/etcd-io/etcd/pull/9298).
   - `curl -L http://localhost:2379/v3beta/kv/put -X POST -d '{"key": "Zm9v", "value": "YmFy"}'` does work in v3.5. Use `curl -L http://localhost:2379/v3/kv/put -X POST -d '{"key": "Zm9v", "value": "YmFy"}'` instead.
 
+### gRPC Proxy
+  
+- Fix [`panic on error`](https://github.com/etcd-io/etcd/pull/11694) for metrics handler.
+
 ### Auth
 
 - Fix [NoPassword check when adding user through GRPC gateway](https://github.com/etcd-io/etcd/pull/11418) ([issue#11414](https://github.com/etcd-io/etcd/issues/11414))