diff --git a/app/models.py b/app/models.py
index 8186bf5448344283a39fc4e14827ec19d0ff0256..5ba6e8f081a8d5519e59e3762312c7674e2a83a6 100644
--- a/app/models.py
+++ b/app/models.py
@@ -373,6 +373,8 @@ class SearchableMixin(object):
     @classmethod
     def after_flush_postexec(cls, session, flush_context):
         """Retrieve the new and updated objects representation"""
+        if session._changes is None:
+            return
         # - We can't call obj.to_dict() in the before_flush event because the id
         #   hasn't been allocated yet (for new objects) and other fields haven't been updated
         #   (default values like created_at/updated_at and some relationships).
@@ -387,6 +389,8 @@ class SearchableMixin(object):
     @classmethod
     def after_commit(cls, session):
         """Update the elasticsearch index"""
+        if session._changes is None:
+            return
         for index, body in session._changes["add"]:
             search.add_to_index(index, body)
         for index, id in session._changes["delete"]: