diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c
index b4a184fba..aaae9d378 100644
--- a/lib/nvme/nvme_tcp.c
+++ b/lib/nvme/nvme_tcp.c
@@ -528,6 +528,7 @@ nvme_tcp_build_sgl_request(struct nvme_tcp_qpair *tqpair, struct nvme_tcp_req *t
 			return -1;
 		}
 
+		length = spdk_min(length, remaining_size);
 		tcp_req->iov[iovcnt].iov_len = length;
 		remaining_size -= length;
 		iovcnt++;