2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index 24c4c62698..938eb29de7 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -267,8 +267,8 @@ class BaseHandler(object):
             event, context=context
         )
 
-        action_generator = ActionGenerator(self.hs, self.store)
-        yield action_generator.handle_event(serialize_event(
+        action_generator = ActionGenerator(self.store)
+        yield action_generator.handle_push_actions_for_event(serialize_event(
             event, self.clock.time_msec()
         ))
 
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 0b1221deb5..764709b424 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -245,8 +245,8 @@ class FederationHandler(BaseHandler):
                     yield user_joined_room(self.distributor, user, event.room_id)
 
         if not backfilled and not event.internal_metadata.is_outlier():
-            action_generator = ActionGenerator(self.hs, self.store)
-            yield action_generator.handle_event(serialize_event(
+            action_generator = ActionGenerator(self.store)
+            yield action_generator.handle_push_actions_for_event(serialize_event(
                 event, self.clock.time_msec())
             )