diff --git a/include/proto/connection.h b/include/proto/connection.h
index ce88f6e..576f3fd 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -490,6 +490,7 @@
 	conn->flags = CO_FL_NONE;
 	conn->data = NULL;
 	conn->owner = NULL;
+	conn->send_proxy_ofs = 0;
 	conn->t.sock.fd = -1; /* just to help with debugging */
 	conn->err_code = CO_ER_NONE;
 	conn->target = NULL;
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index 2c69649..46d0c72 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -54,7 +54,6 @@
 	si->owner          = owner;
 	si->err_type       = SI_ET_NONE;
 	si->conn_retries   = 0;  /* used for logging too */
-	si->send_proxy_ofs = 0;
 	si->exp            = TICK_ETERNITY;
 	si->flags          = SI_FL_NONE;
 	si->end            = NULL;
@@ -202,7 +201,7 @@
 	if (unlikely(!conn || !conn->ctrl || !conn->ctrl->connect))
 		return SN_ERR_INTERNAL;
 
-	ret = conn->ctrl->connect(conn, !channel_is_empty(si->ob), !!si->send_proxy_ofs);
+	ret = conn->ctrl->connect(conn, !channel_is_empty(si->ob), !!conn->send_proxy_ofs);
 	if (ret != SN_ERR_NONE)
 		return ret;
 
@@ -211,7 +210,7 @@
 		conn_get_from_addr(conn);
 
 	/* Prepare to send a few handshakes related to the on-wire protocol. */
-	if (si->send_proxy_ofs)
+	if (conn->send_proxy_ofs)
 		conn->flags |= CO_FL_SI_SEND_PROXY;
 
 	/* we need to be notified about connection establishment */