diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index bcdd858be0..68534208c6 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1925,6 +1925,11 @@ circuit_get_streams_max_data_age(const edge_connection_t *stream, uint32_t now)
     age2 = conn_get_buffer_age(conn, now);
     if (age2 > age)
       age = age2;
+    if (conn->linked_conn) {
+      age2 = conn_get_buffer_age(conn->linked_conn, now);
+      if (age2 > age)
+        age = age2;
+    }
   }
   return age;
 }