2 files changed, 9 insertions, 2 deletions
diff --git a/docs/admin_api/rooms.md b/docs/admin_api/rooms.md
index 86daa393a7..f34cec1ff7 100644
--- a/docs/admin_api/rooms.md
+++ b/docs/admin_api/rooms.md
@@ -535,7 +535,9 @@ A response as follows will be returned:
   "results": [
     {
       "event_id": "$M5SP266vsnxctfwFgFLNceaCo3ujhRtg_NiiHabcdefgh",
-      "state_group": 439
+      "state_group": 439,
+      "depth": 123,
+      "received_ts": 1611263016761
     }
   ]
 }    
@@ -543,6 +545,10 @@ A response as follows will be returned:
 
 ## Deleting forward extremities
 
+**WARNING**: Please ensure you know what you're doing and have read 
+the related issue [#1760](https://github.com/matrix-org/synapse/issues/1760).
+Under no situations should this API be executed as an automated maintenance task!
+
 If a room has lots of forward extremities, the extra can be
 deleted as follows:
 
diff --git a/synapse/storage/databases/main/events_forward_extremities.py b/synapse/storage/databases/main/events_forward_extremities.py
index 5fea974050..84aaa919fb 100644
--- a/synapse/storage/databases/main/events_forward_extremities.py
+++ b/synapse/storage/databases/main/events_forward_extremities.py
@@ -86,9 +86,10 @@ class EventForwardExtremitiesStore(SQLBaseStore):
 
         def get_forward_extremities_for_room_txn(txn):
             sql = """
-                SELECT event_id, state_group
+                SELECT event_id, state_group, depth, received_ts
                 FROM event_forward_extremities
                 NATURAL JOIN event_to_state_groups
+                NATURAL JOIN events
                 WHERE room_id = ?
             """