diff --git a/src/transport_layer/etcp_connections.c b/src/transport_layer/etcp_connections.c
index db09e303..baf94242 100644
--- a/src/transport_layer/etcp_connections.c
+++ b/src/transport_layer/etcp_connections.c
@@ -960,6 +960,7 @@ static void etcp_inflight_nullify_link(struct ll_queue* q, struct ETCP_LINK* dea
 void etcp_link_close(struct ETCP_LINK* link) {
     DEBUG_TRACE(DEBUG_CATEGORY_CONNECTION, "");
     if (!link) return;
+    if (link->etcp && link->etcp->last_rr_link == link) link->etcp->last_rr_link = NULL;
 
     if (link->is_tcp) {
         if (link->tcp_reconnect_timer) { uasync_cancel_timeout(link->etcp->instance->ua, link->tcp_reconnect_timer); link->tcp_reconnect_timer = NULL; }
@@ -1013,7 +1014,6 @@ void etcp_link_close(struct ETCP_LINK* link) {
         }
         pp = &(*pp)->next;
     }
-    if (link->etcp->last_rr_link == link) link->etcp->last_rr_link = NULL;
 
     remove_link_from_queue(link);