Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

1 files changed, 3 insertions, 1 deletions

diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py

index f400b56c4f..70b5cb0f89 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -881,7 +881,9 @@ class EventCreationHandler(object):
         """
         room_alias = RoomAlias.from_string(room_alias_str)
         try:
-            mapping = yield directory_handler.get_association(room_alias)
+            mapping = yield defer.ensureDeferred(
+                directory_handler.get_association(room_alias)
+            )
         except SynapseError as e:
             # Turn M_NOT_FOUND errors into M_BAD_ALIAS errors.
             if e.errcode == Codes.NOT_FOUND: