diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 943b5c1b8..c026d02e0 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -12997,8 +12997,6 @@ void scst_unblock_dev(struct scst_device *dev)
 				break;
 		}
 		local_irq_restore_nort(flags);
-
-		dev->strictly_serialized_cmd_waiting = 0;
 	}
 
 	sBUG_ON(dev->block_count < 0);
diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index b6198f78b..3f3ee4d24 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -547,6 +547,7 @@ void __scst_check_unblock_dev(struct scst_cmd *cmd)
 			TRACE_BLOCK("Strictly serialized cmd waiting: "
 				"unblocking dev %s", dev->virt_name);
 			scst_unblock_dev(dev);
+			dev->strictly_serialized_cmd_waiting = 0;
 		}
 	}