Merge branch 'develop' into matrix-org-hotfixes

1 files changed, 1 insertions, 3 deletions

diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py

index 73e787f2f7..bd468611ae 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -893,9 +893,7 @@ class EventCreationHandler(object):
         except Exception:
             # Ensure that we actually remove the entries in the push actions
             # staging area, if we calculated them.
-            run_in_background(
-                self.store.remove_push_actions_from_staging, event.event_id
-            )
+            await self.store.remove_push_actions_from_staging(event.event_id)
             raise
 
     async def _validate_canonical_alias(