diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index f7655e3c..19aae93d 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -478,6 +478,9 @@ namespace
 
 bool load_txt_records_from_dns(std::vector<std::string> &good_records, const std::vector<std::string> &dns_urls)
 {
+  // Prevent infinite recursion when distributing
+  if (dns_urls.empty()) return false;
+
   std::vector<std::vector<std::string> > records;
   records.resize(dns_urls.size());