diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c
index 79be86898..ffb16799c 100644
--- a/lib/nvmf/ctrlr.c
+++ b/lib/nvmf/ctrlr.c
@@ -352,6 +352,8 @@ spdk_nvmf_ctrlr_create(struct spdk_nvmf_subsystem *subsystem,
 	SPDK_DEBUGLOG(SPDK_LOG_NVMF, "cc 0x%x\n", ctrlr->vcprop.cc.raw);
 	SPDK_DEBUGLOG(SPDK_LOG_NVMF, "csts 0x%x\n", ctrlr->vcprop.csts.raw);
 
+	ctrlr->dif_insert_or_strip = transport->opts.dif_insert_or_strip;
+
 	req->qpair->ctrlr = ctrlr;
 	spdk_thread_send_msg(subsystem->thread, _spdk_nvmf_subsystem_add_ctrlr, req);
 
diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h
index 96d978c46..bc38f3078 100644
--- a/lib/nvmf/nvmf_internal.h
+++ b/lib/nvmf/nvmf_internal.h
@@ -310,10 +310,12 @@ struct spdk_nvmf_ctrlr {
 	TAILQ_HEAD(log_page_head, spdk_nvmf_reservation_log) log_head;
 
 	/* Time to trigger keep-alive--poller_time = now_tick + period */
-	uint64_t last_keep_alive_tick;
-	struct spdk_poller			*keep_alive_poller;
+	uint64_t			last_keep_alive_tick;
+	struct spdk_poller		*keep_alive_poller;
 
-	TAILQ_ENTRY(spdk_nvmf_ctrlr)		link;
+	bool				dif_insert_or_strip;
+
+	TAILQ_ENTRY(spdk_nvmf_ctrlr)	link;
 };
 
 struct spdk_nvmf_subsystem {