Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1

1 files changed, 3 insertions, 0 deletions

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

index 3fab57a7e8..d03f7c541e 100644
--- a/synapse/storage/presence.py
+++ b/synapse/storage/presence.py
@@ -118,6 +118,9 @@ class PresenceStore(SQLBaseStore):
             )
 
     def get_all_presence_updates(self, last_id, current_id):
+        if last_id == current_id:
+            return defer.succeed([])
+
         def get_all_presence_updates_txn(txn):
             sql = (
                 "SELECT stream_id, user_id, state, last_active_ts,"