diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a9047886ee..71b0c1395e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -28,6 +28,7 @@ Changelog
  * Fix: Allow nav menu to take up all available space instead of scrolling (Meteor0id)
  * Fix: Redirects now return 404 when destination is unspecified or a page with no site (Hillary Jeffrey)
  * Fix: Refactor all breakpoint definitions, removing style overlaps (Janneke Janssen)
+ * Fix: Updated draftjs_exporter to 2.1.5 to fix bug in handling adjacent entities (Thibaud Colas)
 
 
 2.3 LTS (23.10.2018)
diff --git a/docs/releases/2.4.rst b/docs/releases/2.4.rst
index 2ca5e8b42b..2258e71cc2 100644
--- a/docs/releases/2.4.rst
+++ b/docs/releases/2.4.rst
@@ -52,6 +52,7 @@ Bug fixes
  * Users without the edit permission no longer see "Edit" links in list of pages waiting for moderation (Justin Focus, Fedor Selitsky)
  * Redirects now return 404 when destination is unspecified or a page with no site (Hillary Jeffrey)
  * Refactor all breakpoint definitions, removing style overlaps (Janneke Janssen)
+ * Updated draftjs_exporter to 2.1.5 to fix bug in handling adjacent entities (Thibaud Colas)
 
 
 Upgrade considerations
diff --git a/setup.py b/setup.py
index 153f319fb1..d6e1bde451 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ install_requires = [
     "django-taggit>=0.23,<0.24",
     "django-treebeard>=4.2.0,<5.0",
     "djangorestframework>=3.7.4,<4.0",
-    "draftjs_exporter>=2.0,<3.0",
+    "draftjs_exporter>=2.1.5,<3.0",
     "Pillow>=4.0.0,<6.0",
     "beautifulsoup4>=4.5.1,<4.6.1",
     "html5lib>=0.999,<2",