diff --git a/website/pages/docs/upgrading/upgrade-to-1.5.0.mdx b/website/pages/docs/upgrading/upgrade-to-1.5.0.mdx
index 560451957..a29cecac0 100644
--- a/website/pages/docs/upgrading/upgrade-to-1.5.0.mdx
+++ b/website/pages/docs/upgrading/upgrade-to-1.5.0.mdx
@@ -42,6 +42,25 @@ This will suppress the metrics `vault.identity.entity.count`,
 `vault.token.count.by_policy`, `vault.token.count.by_ttl` and `vault.secret.kv.count`
 that were introduced in version 1.5.0, but all other Vault telemetry will remain available.
 
+## Zero-length keys in key-value stores will cause Vault to crash.
+
+A key-value data store might have a zero-length key, created before the request handling was
+modified to make this operation impossible. The metrics collection process crashes if it encounters
+this while counting the number of KV secrets.
+
+A workaround for this issue is to disable collection of usage gauges in
+the [telemetry](/docs/configuration/telemetry) stanza of the configuration.
+
+```
+telemetry {
+  ...
+  usage_gauge_period = "none"
+}
+```
+
+This will disable all the metrics listed in the previous section. Or, set the environment value
+`VAULT_DISABLE_KV_GAUGE`, which will disable only `vault.secret.kv.count`.
+
 ## Non-string values in seal config prevent startup
 
 Any values in the [Seal configuration stanza](/docs/configuration/seal)