1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 763f0f5a68..c48c96727e 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -47,7 +47,9 @@ from synapse.handlers.device import DeviceHandler
 from synapse.handlers.e2e_keys import E2eKeysHandler
 from synapse.handlers.presence import PresenceHandler
 from synapse.handlers.room_list import RoomListHandler
-from synapse.handlers.room_member import RoomMemberMasterHandler
+from synapse.handlers.room_member import (
+    RoomMemberMasterHandler, RoomMemberWorkerHandler,
+)
 from synapse.handlers.set_password import SetPasswordHandler
 from synapse.handlers.sync import SyncHandler
 from synapse.handlers.typing import TypingHandler
@@ -393,7 +395,7 @@ class HomeServer(object):
 
     def build_room_member_handler(self):
         if self.config.worker_app:
-            raise Exception("Can't use RoomMemberHandler on workers")
+            return RoomMemberWorkerHandler(self)
         return RoomMemberMasterHandler(self)
 
     def build_federation_registry(self):