diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index afeb6121f9..97aedb369e 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -997,8 +997,8 @@ class E2eKeysHandler(object): if ( key is None and not self.is_mine(user) - # We don't get "user_signing" keys from remote servers, so disallow that here - and desired_key_type != "user_signing" + # We only get "master" and "self_signing" keys from remote servers + and desired_key_type in ["master", "self_signing"] ): try: remote_result = yield self.federation.query_user_devices(