diff --git a/synapse/storage/databases/main/transactions.py b/synapse/storage/databases/main/transactions.py
index 0309661841..f14a133c0b 100644
--- a/synapse/storage/databases/main/transactions.py
+++ b/synapse/storage/databases/main/transactions.py
@@ -428,7 +428,8 @@ class TransactionStore(TransactionWorkerStore):
     ) -> List[str]:
         q = """
                 SELECT event_id FROM destination_rooms
-                 JOIN events USING (stream_ordering)
+                 INNER JOIN events USING (stream_ordering)
+                 INNER JOIN event_forward_extremities USING (event_id)
                 WHERE destination = ?
                   AND stream_ordering > ?
                 ORDER BY stream_ordering