diff --git a/src/org/jgroups/protocols/TP.java b/src/org/jgroups/protocols/TP.java
index 8dd53e9be72..a114df96197 100644
--- a/src/org/jgroups/protocols/TP.java
+++ b/src/org/jgroups/protocols/TP.java
@@ -1381,6 +1381,7 @@ protected void sendToAll(byte[] buf, int offset, int length) throws Exception {
             }
         }
 
+        List<PhysicalAddress> dests=new ArrayList<>(mbrs.size());
         for(Address mbr: mbrs) {
             if(local_send_successful && local_transport != null && local_transport.isLocalMember(mbr))
                 continue; // skip if local transport sent the message successfully
@@ -1392,22 +1393,29 @@ protected void sendToAll(byte[] buf, int offset, int length) throws Exception {
                 missing.add(mbr);
                 continue;
             }
+            if(!Objects.equals(local_physical_addr, target))
+                dests.add(target);
+        }
+        if(!dests.isEmpty())
+            sendUnicasts(dests, buf, offset, length);
+        if(missing != null)
+            fetchPhysicalAddrs(missing);
+    }
+
+    protected void sendUnicasts(List<PhysicalAddress> dests, byte[] data, int offset, int length) throws Exception {
+        for(PhysicalAddress dest: dests) {
             try {
-                if(!Objects.equals(local_physical_addr, target))
-                    sendUnicast(target, buf, offset, length);
+                sendUnicast(dest, data, offset, length);
             }
             catch(SocketException | SocketTimeoutException sock_ex) {
-                log.debug(Util.getMessage("FailureSendingToPhysAddr"), local_addr, mbr, sock_ex);
+                log.debug(Util.getMessage("FailureSendingToPhysAddr"), local_addr, dest, sock_ex);
             }
             catch(Throwable t) {
-                log.error(Util.getMessage("FailureSendingToPhysAddr"), local_addr, mbr, t);
+                log.error(Util.getMessage("FailureSendingToPhysAddr"), local_addr, dest, t);
             }
         }
-        if(missing != null)
-            fetchPhysicalAddrs(missing);
     }
 
-
     protected void fetchPhysicalAddrs(List<Address> missing) {
         long current_time=0;
         boolean do_send=false;
@@ -1431,7 +1439,6 @@ protected Responses fetchResponsesFromDiscoveryProtocol(List<Address> missing) {
         return (Responses)up_prot.up(new Event(Event.FIND_MBRS, missing));
     }
 
-
     protected long timestamp() {return time_service != null? time_service.timestamp() : System.nanoTime();}
 
     /**