diff --git a/roles/matrix/files/synapse-worker@.service b/roles/matrix/files/synapse-worker@.service
index e4d423614bd357b8f0205a69180e52b0853bebca..54248025441dfcc8e7294e05ea78f80548869f09 100644
--- a/roles/matrix/files/synapse-worker@.service
+++ b/roles/matrix/files/synapse-worker@.service
@@ -18,6 +18,7 @@ ExecStart=/var/lib/synapse/venv/bin/python -m synapse.app.generic_worker --confi
 SyslogIdentifier=synapse
 
 Environment=LD_PRELOAD=/usr/lib/libjemalloc.so
+Environment=PYTHONMALLOC=malloc
 
 [Install]
 RequiredBy=synapse.service
diff --git a/roles/matrix/files/synapse.service b/roles/matrix/files/synapse.service
index 2361d456e0c2d19d9f92c8b5397ed519aeec6ebb..e6c48685bbb076e07e9c5f2b07ffe916e9d45f2c 100644
--- a/roles/matrix/files/synapse.service
+++ b/roles/matrix/files/synapse.service
@@ -19,6 +19,7 @@ ExecStart=/var/lib/synapse/venv/bin/python -m synapse.app.homeserver --config-pa
 SyslogIdentifier=synapse
 
 Environment=LD_PRELOAD=/usr/lib/libjemalloc.so
+Environment=PYTHONMALLOC=malloc
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/matrix/tasks/main.yml b/roles/matrix/tasks/main.yml
index 18456b8b8818d9ccd67f88f4af8f8a60e4413194..72e2313969c8aa71c0304371159f2aa809d0a48e 100644
--- a/roles/matrix/tasks/main.yml
+++ b/roles/matrix/tasks/main.yml
@@ -78,7 +78,7 @@
 - name: Install synapse
   pip:
     name:
-      - 'matrix-synapse[postgres,oidc,systemd,url-preview,redis,user-search]==1.115.0'
+      - 'matrix-synapse[postgres,oidc,systemd,url-preview,redis,user-search]==1.117.0'
     state: latest
     extra_args: '--upgrade-strategy=eager'
     virtualenv: /var/lib/synapse/venv
diff --git a/roles/matrix/templates/homeserver.yaml.j2 b/roles/matrix/templates/homeserver.yaml.j2
index a53d17ff1ccecee71c02f18d5f5aef6db9fe5a64..dcdd6f1df19de76d39859b5f8f4e8d15d5ef062f 100644
--- a/roles/matrix/templates/homeserver.yaml.j2
+++ b/roles/matrix/templates/homeserver.yaml.j2
@@ -61,6 +61,8 @@ caches:
 presence:
   enabled: false
 
+max_event_delay_duration: 24h
+
 # Retention
 delete_stale_devices_after: 1y
 media_retention: