diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 2b1ebd86e..de36937e1 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -6268,6 +6268,9 @@ again:
 							"needed global UA %p",
 							ua);
 						list_del(&ua->UA_list_entry);
+						if (list_empty(&tgt_dev->UA_list))
+						    clear_bit(SCST_TGT_DEV_UA_PENDING,
+							      &tgt_dev->tgt_dev_flags);
 						mempool_free(ua, scst_ua_mempool);
 						break;
 					}
diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index 048f98626..68fc2cb8e 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -1815,6 +1815,9 @@ out_compl:
 						"REPORTED LUNS DATA CHANGED UA "
 						"%p", ua);
 					list_del(&ua->UA_list_entry);
+					if (list_empty(&tgt_dev->UA_list))
+						clear_bit(SCST_TGT_DEV_UA_PENDING,
+							  &tgt_dev->tgt_dev_flags);
 					mempool_free(ua, scst_ua_mempool);
 					break;
 				}