Merge pull request #2656 from matrix-org/rav/fix_deactivate

Fix 'NoneType' not iterable in /deactivate

1 files changed, 1 insertions, 2 deletions

diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py

index 9c4f61da76..71748de733 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -241,7 +241,6 @@ class RegistrationStore(background_updates.BackgroundUpdateStore):
             "user_set_password_hash", user_set_password_hash_txn
         )
 
-    @defer.inlineCallbacks
     def user_delete_access_tokens(self, user_id, except_token_id=None,
                                   device_id=None):
         """
@@ -290,7 +289,7 @@ class RegistrationStore(background_updates.BackgroundUpdateStore):
 
             return tokens_and_devices
 
-        yield self.runInteraction(
+        return self.runInteraction(
             "user_delete_access_tokens", f,
         )