diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp
index 64f767a..1f36273 100644
--- a/src/remoteClient/clientContextImpl.cpp
+++ b/src/remoteClient/clientContextImpl.cpp
@@ -4526,16 +4526,17 @@ namespace epics {
                     {
                         m_searchTransport->setSendAddresses(list.get());
                     }
-                    else    // TODO or no fallback at all
+                    /*
+                    else
                     {
                         // fallback
                         // set default (auto) address list
                         m_searchTransport->setSendAddresses(&autoBCastAddr);
                     }
+                    */
                 }
-                else
+                else if (m_autoAddressList)
                 {
-                    // fallback
                     // set default (auto) address list
                     m_searchTransport->setSendAddresses(&autoBCastAddr);
                 }
@@ -4545,8 +4546,8 @@ namespace epics {
                 // debug output for broadcast addresses
                 InetAddrVector* blist = m_searchTransport->getSendAddresses();
                 if (!blist || !blist->size())
-                    LOG(logLevelWarn,
-                        "No broadcast addresses found or specified!");
+                    LOG(logLevelError,
+                        "No broadcast addresses found or specified - empty PV search address list!");
                 else
                     for (size_t i = 0; i < blist->size(); i++)
                         LOG(logLevelDebug,
diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp
index 95808d9..4957a74 100644
--- a/src/server/serverContext.cpp
+++ b/src/server/serverContext.cpp
@@ -319,16 +319,17 @@ void ServerContextImpl::initializeBroadcastTransport()
         {
             _broadcastTransport->setSendAddresses(list.get());
         }
-        else    // TODO or no fallback at all
+        /*
+        else
         {
             // fallback
             // set default (auto) address list
             _broadcastTransport->setSendAddresses(&autoBCastAddr);
         }
+        */
     }
-    else
+    else if (_autoBeaconAddressList)
     {
-        // fallback
         // set default (auto) address list
         _broadcastTransport->setSendAddresses(&autoBCastAddr);
     }
@@ -337,8 +338,8 @@ void ServerContextImpl::initializeBroadcastTransport()
     // debug output for broadcast addresses
     InetAddrVector* blist = _broadcastTransport->getSendAddresses();
     if (!blist || !blist->size())
-        LOG(logLevelWarn,
-            "No beacon broadcast addresses found or specified!");
+        LOG(logLevelError,
+            "No broadcast addresses found or specified - empty beacon address list!");
     else
         for (size_t i = 0; i < blist->size(); i++)
             LOG(logLevelDebug,