diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index e9a6321020..e6377e3060 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -207,7 +207,6 @@ def setup():
         web_client=config.webclient,
         redirect_root_to_web_client=True,
     )
-    hs.start_listening(config.bind_port, config.unsecure_port)
 
     prepare_database(hs.get_db_name())
 
@@ -220,6 +219,8 @@ def setup():
         f.namespace['hs'] = hs
         reactor.listenTCP(config.manhole, f, interface='127.0.0.1')
 
+    hs.start_listening(config.bind_port, config.unsecure_port)
+
     if config.daemonize:
         print config.pid_file
         daemon = Daemonize(