diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index bfcc5e3ff3..7dd036e70f 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -489,6 +489,10 @@ circuit_deliver_create_cell(circuit_t *circ, uint8_t cell_type,
 
   memcpy(cell.payload, payload, ONIONSKIN_CHALLENGE_LEN);
   connection_or_write_cell_to_buf(&cell, circ->n_conn);
+
+  /* mark it so it gets better rate limiting treatment. */
+  circ->n_conn->client_used = 1;
+
   return 0;
 }
 
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 44c3197b5c..beb1caeea6 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1792,11 +1792,6 @@ connection_ap_handshake_send_begin(edge_connection_t *ap_conn,
   log_info(LD_APP,"Address/port sent, ap socket %d, n_circ_id %d",
            ap_conn->_base.s, circ->_base.n_circ_id);
   control_event_stream_status(ap_conn, STREAM_EVENT_SENT_CONNECT, 0);
-
-  if ((TO_CIRCUIT(circ))->n_conn) {
-    /* mark it so it gets better rate limiting treatment. */
-    (TO_CIRCUIT(circ))->n_conn->client_used = 1;
-  }
   return 0;
 }