diff --git a/scst/src/scst_copy_mgr.c b/scst/src/scst_copy_mgr.c
index b81b7a5a5..f8baae044 100644
--- a/scst/src/scst_copy_mgr.c
+++ b/scst/src/scst_copy_mgr.c
@@ -2675,6 +2675,10 @@ void scst_cm_update_dev(struct scst_device *dev)
 
 	TRACE_MGMT_DBG("copy manager: updating device %s", dev->virt_name);
 
+	if (!scst_auto_cm_assignment ||
+	    !dev->handler->auto_cm_assignment_possible)
+		goto out;
+
 	res = scst_suspend_activity(SCST_SUSPEND_TIMEOUT_UNLIMITED);
 	WARN_ON_ONCE(res);
 
@@ -2698,6 +2702,7 @@ out_resume:
 	mutex_unlock(&scst_mutex);
 	scst_resume_activity();
 
+out:
 	TRACE_EXIT();
 	return;