diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp
index af0675e9..883a65ee 100644
--- a/src/currency_core/blockchain_storage.cpp
+++ b/src/currency_core/blockchain_storage.cpp
@@ -2700,7 +2700,7 @@ bool blockchain_storage::get_target_outs_for_amount_prezarcanum(const COMMAND_RP
     std::set<size_t> used;
     used.insert(details.own_global_index);
     size_t try_count = 0;
-    for (uint64_t j = 0; j != decoys_count && try_count++ < decoys_count+1;)
+    for (uint64_t j = 0; j != decoys_count || used.size() >= up_index_limit;)
     {
       size_t g_index_initial = crypto::rand<size_t>() % up_index_limit;
       size_t g_index = g_index_initial;