diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0060e35104d..458436335c3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@
 
 ### Fixed
 
+- Avoid potential deadlocks upon callback errors in the caching module for
+  database entities.
+  [#2197](https://github.com/Mashape/kong/pull/2197)
 - Relax multipart MIME type parsing. A space is allowed in between values
   of the Content-Type header.
   [#2215](https://github.com/Mashape/kong/pull/2215)