diff --git a/docs/workers.rst b/docs/workers.rst
index dd3a84ba0db5fcc2b7e4b39692066166d64af2a1..6ce7d88c11e044650d223b016bbd2a25ac895d22 100644
--- a/docs/workers.rst
+++ b/docs/workers.rst
@@ -223,6 +223,12 @@ following regular expressions::
     ^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/members$
     ^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/state$
 
+Additionally, the following REST endpoints can be handled, but all requests must
+be routed to the same instance::
+
+    ^/_matrix/client/(api/v1|r0|unstable)/register$
+
+
 ``synapse.app.user_dir``
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index d78da5078719672657eb25e5ffa42a0298f2cd07..c52280c50cb68ca55f2effdc8fab5c2f78ec1b9c 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -665,7 +665,7 @@ class RegisterRestServlet(RestServlet):
                 device.
             is_guest (bool): Whether this is a guest account
         Returns:
-            defer.Deferred[(str, str)]: Tuple of device ID and access token
+            defer.Deferred[tuple[str, str]]: Tuple of device ID and access token
         """
         if self.hs.config.worker_app:
             r = yield self._register_device_client(