diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index b7b09aeca191..d7607535ad09 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -1116,6 +1116,10 @@ static void update_remote_addr(struct lightningd *ld,
 			       const struct wireaddr *remote_addr,
 			       const struct node_id peer_id)
 {
+	/* failsafe to prevent privacy leakage. */
+	if (ld->always_use_proxy)
+		return;
+
 	switch (remote_addr->type) {
 	case ADDR_TYPE_IPV4:
 		/* init pointers first time */