Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_notifs

1 files changed, 3 insertions, 0 deletions

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

index 2ef13d7403..11813b44f6 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -320,6 +320,9 @@ class RoomStore(SQLBaseStore):
             txn.execute(sql, (prev_id, current_id, limit,))
             return txn.fetchall()
 
+        if prev_id == current_id:
+            return defer.succeed([])
+
         return self.runInteraction(
             "get_all_new_public_rooms", get_all_new_public_rooms
         )