diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c
index 8bbb459b3..aa634a892 100644
--- a/lib/nvmf/tcp.c
+++ b/lib/nvmf/tcp.c
@@ -649,9 +649,18 @@ nvmf_tcp_create(struct spdk_nvmf_transport_opts *opts)
 
 	/* I/O unit size cannot be larger than max I/O size */
 	if (opts->io_unit_size > opts->max_io_size) {
+		SPDK_WARNLOG("TCP param io_unit_size %u can't be larger than max_io_size %u. Using max_io_size as io_unit_size\n",
+			     opts->io_unit_size, opts->max_io_size);
 		opts->io_unit_size = opts->max_io_size;
 	}
 
+	/* In capsule data size cannot be larger than max I/O size */
+	if (opts->in_capsule_data_size > opts->max_io_size) {
+		SPDK_WARNLOG("TCP param ICD size %u can't be larger than max_io_size %u. Using max_io_size as ICD size\n",
+			     opts->io_unit_size, opts->max_io_size);
+		opts->in_capsule_data_size = opts->max_io_size;
+	}
+
 	sge_count = opts->max_io_size / opts->io_unit_size;
 	if (sge_count > SPDK_NVMF_MAX_SGL_ENTRIES) {
 		SPDK_ERRLOG("Unsupported IO Unit size specified, %d bytes\n", opts->io_unit_size);