diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c
--- a/usr.sbin/iscsid/login.c
+++ b/usr.sbin/iscsid/login.c
@@ -403,9 +403,6 @@
 			tmp = isl->isl_max_send_data_segment_length;
 		}
 		conn->conn_max_send_data_segment_length = tmp;
-		/* We received target's limit, that means it accepted our's. */
-		conn->conn_max_recv_data_segment_length =
-		    isl->isl_max_recv_data_segment_length;
 	} else if (strcmp(name, "MaxBurstLength") == 0) {
 		tmp = strtoul(value, NULL, 10);
 		if (tmp <= 0)
@@ -538,6 +535,9 @@
 		    isl->isl_max_recv_data_segment_length);
 	}
 
+	conn->conn_max_recv_data_segment_length =
+	    isl->isl_max_recv_data_segment_length;
+
 	keys_add(request_keys, "DefaultTime2Wait", "0");
 	keys_add(request_keys, "DefaultTime2Retain", "0");
 	keys_add(request_keys, "ErrorRecoveryLevel", "0");