diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 77063b021a2c..9fd34588dd38 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -441,7 +441,7 @@ def fetch_all_remote_lists(self):
             self.hs.config.secondary_directory_servers
         )
         self.remote_list_request_cache.set((), deferred)
-        yield deferred
+        self.remote_list_cache = yield deferred
 
     @defer.inlineCallbacks
     def get_aggregated_public_room_list(self):