diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c
index cbcb672140b74f71bdc38284e9c346dcb72fbd36..24d34144e4f3a2b85ee19e1e5f0cee49db52bc0e 100644
--- a/src/feature/hs/hs_common.c
+++ b/src/feature/hs/hs_common.c
@@ -887,12 +887,14 @@ hs_set_conn_addr_port(const smartlist_t *ports, edge_connection_t *conn)
   chosen_port = smartlist_choose(matching_ports);
   smartlist_free(matching_ports);
   if (chosen_port) {
-    if (!(chosen_port->is_unix_addr)) {
-      /* save the original destination before we overwrite it */
-      if (conn->hs_ident) {
-        conn->hs_ident->orig_virtual_port = TO_CONN(conn)->port;
-      }
+    /* Remember, v2 doesn't use an hs_ident. */
+    if (conn->hs_ident) {
+      /* There is always a connection identifier at this point. Regardless of a
+       * Unix or TCP port, note the virtual port. */
+      conn->hs_ident->orig_virtual_port = chosen_port->virtual_port;
+    }
 
+    if (!(chosen_port->is_unix_addr)) {
       /* Get a non-AF_UNIX connection ready for connection_exit_connect() */
       tor_addr_copy(&TO_CONN(conn)->addr, &chosen_port->real_addr);
       TO_CONN(conn)->port = chosen_port->real_port;