Merge branch 'master' into develop

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index 7d6b51b5bc..8233905844 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -447,7 +447,7 @@ def setup(config_options):
                 reactor.stop()
             sys.exit(1)
 
-    reactor.addSystemEventTrigger("before", "startup", start)
+    reactor.callWhenRunning(start)
 
     return hs