diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index 2688dc34e..adb7192ac 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -4303,8 +4303,6 @@ static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
 
 	TRACE_ENTRY();
 
-	mcmd->state = SCST_MCMD_STATE_READY;
-
 	switch (mcmd->fn) {
 	case SCST_ABORT_TASK:
 	{
@@ -4359,6 +4357,7 @@ static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
 	case SCST_NEXUS_LOSS:
 	case SCST_ABORT_ALL_TASKS:
 	case SCST_UNREG_SESS_TM:
+		mcmd->state = SCST_MCMD_STATE_READY;
 		break;
 
 	case SCST_ABORT_TASK_SET:
@@ -4366,12 +4365,14 @@ static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
 	case SCST_CLEAR_TASK_SET:
 	case SCST_LUN_RESET:
 		rc = scst_mgmt_translate_lun(mcmd);
-		if (rc < 0) {
+		if (rc == 0)
+			mcmd->state = SCST_MCMD_STATE_READY;
+		else if (rc < 0) {
 			PRINT_ERROR("Corresponding device for LUN %lld not "
 				"found", (long long unsigned int)mcmd->lun);
 			mcmd->status = SCST_MGMT_STATUS_LUN_NOT_EXIST;
 			mcmd->state = SCST_MCMD_STATE_DONE;
-		} else if (rc != 0)
+		} else
 			res = rc;
 		break;