diff --git a/oml/changelog.py b/oml/changelog.py
index b0356af..50446ff 100644
--- a/oml/changelog.py
+++ b/oml/changelog.py
@@ -114,6 +114,8 @@ class Changelog(db.Model):
                     peer.save()
 
         for change in changes:
+            if state.shutdown:
+                return False
             if user.id in state.removepeer:
                 del state.removepeer[user.id]
                 return False