diff --git a/src/server_server.rs b/src/server_server.rs
index 421b4f8..26d4b40 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -1002,6 +1002,9 @@ fn handle_incoming_pdu<'a>(
             }
         }
 
+        // Add incoming event as forward extremity
+        extremities.insert(incoming_pdu.event_id.clone());
+
         // 12. Ensure that the state is derived from the previous current state (i.e. we calculated
         //     by doing state res where one of the inputs was a previously trusted set of state,
         //     don't just trust a set of state we got from a remote).