diff --git a/src/remote/blockingUDPTransport.cpp b/src/remote/blockingUDPTransport.cpp
index 70aced6..413f1ef 100644
--- a/src/remote/blockingUDPTransport.cpp
+++ b/src/remote/blockingUDPTransport.cpp
@@ -621,49 +621,41 @@ void initializeUDPTransports(bool serverFlag,
     //
     // set send address list
     //
-
-    if (!addressList.empty())
     {
-        // if auto is true, add it to specified list
-        if (!autoAddressList)
-            autoBCastAddr.clear();
-
         InetAddrVector list;
-        getSocketAddressList(list, addressList, sendPort, &autoBCastAddr);
-        if (!list.empty())
-        {
-            sendTransport->setSendAddresses(list);
-        }
-        /*
-        else
-        {
-            // fallback
-            // set default (auto) address list
-            sendTransport->setSendAddresses(&autoBCastAddr);
-        }
-        */
-    }
-    else if (autoAddressList)
-    {
-        // set default (auto) address list
-        sendTransport->setSendAddresses(autoBCastAddr);
-    }
+        getSocketAddressList(list, addressList, sendPort, autoAddressList ? &autoBCastAddr : NULL);
 
+        std::vector<bool> isunicast(list.size());
+
+        if (list.empty()) {
+            LOG(logLevelError,
+                "No broadcast addresses found or specified - empty address list!");
+        }
+
+        for (size_t i = 0; i < list.size(); i++) {
+
+            isunicast[i] = !isMulticastAddress(&list[i]);
+
+            for (IfaceNodeVector::const_iterator iter = ifaceList.begin(); isunicast[i] && iter != ifaceList.end(); iter++)
+            {
+                ifaceNode node = *iter;
+                // compare with all iface bcasts
+                if(node.validBcast && list[i].ia.sin_family==iter->bcast.ia.sin_family
+                        && list[i].ia.sin_addr.s_addr==iter->bcast.ia.sin_addr.s_addr) {
+                    isunicast[i] = false;
+                }
+            }
+            LOG(logLevelDebug,
+                "Broadcast address #%zu: %s. (%sunicast)", i, inetAddressToString(list[i]).c_str(),
+                isunicast[i]?"":"not ");
+        }
+
+        sendTransport->setSendAddresses(list, isunicast);
+    }
 
     sendTransport->start();
     udpTransports.push_back(sendTransport);
 
-    // debug output of broadcast addresses
-    const InetAddrVector& blist = sendTransport->getSendAddresses();
-    if (blist.empty())
-        LOG(logLevelError,
-            "No broadcast addresses found or specified - empty address list!");
-    else
-        for (size_t i = 0; i < blist.size(); i++)
-            LOG(logLevelDebug,
-                "Broadcast address #%zu: %s.", i, inetAddressToString(blist[i]).c_str());
-
-
     // TODO configurable local NIF, address
     osiSockAddr loAddr;
     getLoopbackNIF(loAddr, "", 0);
diff --git a/src/remote/pv/blockingUDP.h b/src/remote/pv/blockingUDP.h
index 6cec9ac..e96be1e 100644
--- a/src/remote/pv/blockingUDP.h
+++ b/src/remote/pv/blockingUDP.h
@@ -290,19 +290,10 @@ public:
         return false;
     }
 
-    /**
-     * Set list of send addresses.
-     * @param addresses list of send addresses, non-<code>null</code>.
-     */
-    void setSendAddresses(const InetAddrVector& addresses) {
-        std::vector<bool> isuni(addresses.size(), false);
-        InetAddrVector broadcastAddresses;
-        getBroadcastAddresses(broadcastAddresses, _channel, 0);
-        for(size_t i=0, N=addresses.size(); i<N; i++)
-            isuni[i] = !isBroadcastAddress(&addresses[i], broadcastAddresses)
-                    && !isMulticastAddress(&addresses[i]);
-        _sendAddresses = addresses;
-        _isSendAddressUnicast.swap(isuni);
+    // consumes arguments
+    void setSendAddresses(InetAddrVector& addresses, std::vector<bool>& address_types) {
+        _sendAddresses.swap(addresses);
+        _isSendAddressUnicast.swap(address_types);
     }
 
     void join(const osiSockAddr & mcastAddr, const osiSockAddr & nifAddr);