diff --git a/lib/scsi/task.c b/lib/scsi/task.c
index f0b946480..95c1e7de4 100644
--- a/lib/scsi/task.c
+++ b/lib/scsi/task.c
@@ -260,6 +260,8 @@ void
 spdk_scsi_task_set_status(struct spdk_scsi_task *task, int sc, int sk,
 			  int asc, int ascq)
 {
-	spdk_scsi_task_build_sense_data(task, sk, asc, ascq);
+	if (sc == SPDK_SCSI_STATUS_CHECK_CONDITION) {
+		spdk_scsi_task_build_sense_data(task, sk, asc, ascq);
+	}
 	task->status = sc;
 }