Merge branch 'develop' into markjh/bearer_token

1 files changed, 1 insertions, 0 deletions

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

index 3b687957dd..0548b81c34 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -187,6 +187,7 @@ class TypingHandler(object):
                         "user_id": user_id,
                         "typing": typing,
                     },
+                    key=(room_id, user_id),
                 ))
 
         yield preserve_context_over_deferred(