diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 9bd5c43a3..108e680f4 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -853,10 +853,11 @@ static int scst_set_lun_not_supported_request_sense(struct scst_cmd *cmd,
 
 	sense_len = scst_set_sense(sg_virt(cmd->sg),
 		cmd->bufflen, cmd->cdb[1] & 1, key, asc, ascq);
-	scst_set_resp_data_len(cmd, sense_len);
 
 	TRACE_BUFFER("Sense set", sg_virt(cmd->sg), sense_len);
 
+	scst_set_resp_data_len(cmd, sense_len);
+
 	res = 0;
 	cmd->completed = 1;
 
@@ -904,6 +905,8 @@ static int scst_set_lun_not_supported_inquiry(struct scst_cmd *cmd)
 
 	TRACE_BUFFER("INQUIRY for not supported LUN set", buf, len);
 
+	scst_set_resp_data_len(cmd, len);
+
 	res = 0;
 	cmd->completed = 1;