diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 18ee0dfcf8..320d8cb501 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1923,7 +1923,11 @@ connection_or_send_netinfo(or_connection_t *conn)
 
   /* Their address. */
   out = cell.payload + 4;
-  len = append_address_to_payload(out, &conn->real_addr);
+  /* We use &conn->real_addr below, unless it hasn't yet been set. If it
+   * hasn't yet been set, we know that _base.addr hasn't been tampered with
+   * yet either. */
+  len = append_address_to_payload(out, !tor_addr_is_null(&conn->real_addr)
+                                       ? &conn->real_addr : &conn->_base.addr);
   if (len<0)
     return -1;
   out += len;