diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c
index c3a3adbf3..23feea7ac 100644
--- a/lib/iscsi/iscsi.c
+++ b/lib/iscsi/iscsi.c
@@ -3296,7 +3296,7 @@ _spdk_iscsi_op_abort_task_set(void *arg)
 	return 1;
 }
 
-static void
+void
 spdk_iscsi_op_abort_task_set(struct spdk_iscsi_task *task, uint8_t function)
 {
 	task->scsi.function = function;
diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h
index 169a4799a..31bdbb428 100644
--- a/lib/iscsi/iscsi.h
+++ b/lib/iscsi/iscsi.h
@@ -444,6 +444,8 @@ uint32_t spdk_iscsi_pdu_calc_data_digest(struct spdk_iscsi_pdu *pdu);
 void spdk_put_pdu(struct spdk_iscsi_pdu *pdu);
 struct spdk_iscsi_pdu *spdk_get_pdu(void);
 int spdk_iscsi_conn_handle_queued_datain_tasks(struct spdk_iscsi_conn *conn);
+void spdk_iscsi_op_abort_task_set(struct spdk_iscsi_task *task,
+				  uint8_t function);
 
 static inline int
 spdk_get_immediate_data_buffer_size(void)
diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c
index 729a9d46d..be106d6bf 100644
--- a/lib/iscsi/tgt_node.c
+++ b/lib/iscsi/tgt_node.c
@@ -1280,9 +1280,8 @@ spdk_iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn,
 		task->scsi.target_port = conn->target_port;
 		task->scsi.initiator_port = conn->initiator_port;
 		task->scsi.lun = lun;
-		task->scsi.function = SPDK_SCSI_TASK_FUNC_LUN_RESET;
 
-		spdk_scsi_dev_queue_mgmt_task(target->dev, &task->scsi);
+		spdk_iscsi_op_abort_task_set(task, SPDK_SCSI_TASK_FUNC_LUN_RESET);
 	}
 
 	return 0;
diff --git a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c
index eda02db68..5b4f7528b 100644
--- a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c
+++ b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c
@@ -62,6 +62,10 @@ DEFINE_STUB(spdk_scsi_lun_get_id,
 	    (const struct spdk_scsi_lun *lun),
 	    0);
 
+DEFINE_STUB_V(spdk_iscsi_op_abort_task_set,
+	      (struct spdk_iscsi_task *task,
+	       uint8_t function));
+
 bool
 spdk_sock_is_ipv6(struct spdk_sock *sock)
 {