diff --git a/targets.cc b/targets.cc
index 3fb12e1ed..bbd67241d 100644
--- a/targets.cc
+++ b/targets.cc
@@ -441,7 +441,7 @@ batchfull:
       hs->hostbatch[0]->af() == AF_INET &&
       hs->hostbatch[0]->directlyConnected() && 
       o.sendpref != PACKET_SEND_IP_STRONG &&
-      o.implicitARPPing) {
+      (pingtype == PINGTYPE_ARP || o.implicitARPPing)) {
     arpping(hs->hostbatch, hs->current_batch_sz);
     arpping_done = true;
   }
@@ -452,7 +452,7 @@ batchfull:
       hs->hostbatch[0]->af() == AF_INET6 &&
       hs->hostbatch[0]->directlyConnected() &&
       o.sendpref != PACKET_SEND_IP_STRONG &&
-      o.implicitARPPing) {
+      (pingtype == PINGTYPE_ARP || o.implicitARPPing)) {
     arpping(hs->hostbatch, hs->current_batch_sz);
     arpping_done = true;
   }