diff --git a/ChangeLog.d/tls13-fix-finished-fetch.txt b/ChangeLog.d/tls13-fix-finished-fetch.txt
new file mode 100644
index 0000000000..28c30f9092
--- /dev/null
+++ b/ChangeLog.d/tls13-fix-finished-fetch.txt
@@ -0,0 +1,5 @@
+Bugfix
+   * Fix handshake failure when the peer Finished message has not been received
+     yet when we first try to fetch it. The fetching is moved before the
+     preprocessing computations to avoid doing them multiple times, which was
+     causing the handshake to fail.