Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocreate_autojoin

1 files changed, 3 insertions, 0 deletions

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

index 9060ab14f6..e4a68715aa 100644
--- a/synapse/app/event_creator.py
+++ b/synapse/app/event_creator.py
@@ -178,6 +178,9 @@ def start(config_options):
 
     setup_logging(config, use_worker_options=True)
 
+    # This should only be done on the user directory worker or the master
+    config.update_user_directory = False
+
     events.USE_FROZEN_DICTS = config.use_frozen_dicts
 
     database_engine = create_engine(config.database_config)