diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0c7bcbd..07ce191 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,9 +10,12 @@ Changelog
 - Flush indices when server is flushed (fixes #4)
 - Perform insertions and deletion in bulk for better efficiency (fixes #5)
 
+**Bug fixes**
+
+- Only index records if the storage transaction is committed (fixes #15)
+
 
 0.0.1 (2017-05-22)
 ------------------
 
 - Import code from `Kinto official tutorial <http://kinto.readthedocs.io/en/stable/tutorials/write-plugin.html>`_
-
diff --git a/kinto_elasticsearch/__init__.py b/kinto_elasticsearch/__init__.py
index 07eede7..1aa4628 100644
--- a/kinto_elasticsearch/__init__.py
+++ b/kinto_elasticsearch/__init__.py
@@ -2,7 +2,7 @@
 
 from kinto.core import load_default_settings
 from kinto.events import ServerFlushed
-from kinto.core.events import ResourceChanged
+from kinto.core.events import AfterResourceChanged
 
 from . import indexer
 from . import listener
@@ -27,7 +27,7 @@ def includeme(config):
     # Activate end-points.
     config.scan("kinto_elasticsearch.views")
 
-    config.add_subscriber(listener.on_record_changed, ResourceChanged,
+    config.add_subscriber(listener.on_record_changed, AfterResourceChanged,
                           for_resources=("record",))
     config.add_subscriber(listener.on_server_flushed, ServerFlushed)