diff --git a/ChangeLog.d/issue5065.txt b/ChangeLog.d/issue5065.txt
new file mode 100644
index 000000000..f468c63ff
--- /dev/null
+++ b/ChangeLog.d/issue5065.txt
@@ -0,0 +1,4 @@
+Bugfix
+   * Use switch statement instead if-else in
+     psa_aead_check_nonce_length()
+     and psa_aead_set_lengths(). Fixes #5065.