diff --git a/.werks/16121.md b/.werks/16121.md
new file mode 100644
index 00000000000..b350ffa2d5f
--- /dev/null
+++ b/.werks/16121.md
@@ -0,0 +1,22 @@
+[//]: # (werk v2)
+# Fixed CMC crash when sending illegal metrics to InfluxDB
+
+key        | value
+---------- | ---
+date       | 2024-08-14T14:17:10+00:00
+version    | 2.3.0p13
+class      | fix
+edition    | cee
+component  | cmc
+level      | 1
+compatible | yes
+
+When the CMC tried to send to a metric to an InfluxDB where the metric name
+was malformed (e.g. starting with an underscore), the CMC crashed.  This
+has been fixed, such metrics are now simply forwarded to the InfluxDB.  The
+latter will probably be a bit unhappy about such metric names, but this can
+be figured out via its logs, and the corresponding check can be fixed.
+
+Note that in a future Checkmk version, we will probably drop such metrics
+silently, logging this only for higher log levels to avoid log spam at the
+default log settings.