diff --git a/.werks/17504.md b/.werks/17504.md
new file mode 100644
index 00000000000..abfd594cfc4
--- /dev/null
+++ b/.werks/17504.md
@@ -0,0 +1,16 @@
+[//]: # (werk v2)
+# Do not crash when attempting to bake and sign agents with empty password
+
+key        | value
+---------- | ---
+date       | 2025-02-07T10:52:14+00:00
+version    | 2.5.0b1
+class      | fix
+edition    | cee
+component  | agents
+level      | 1
+compatible | yes
+
+When pressing "Bake and sign" without entering a password for the signing key, the UI crashed with
+the error message "Internal error: Password must not be empty". As of this werk, the UI will instead
+show a standard validation error in case of an empty password.