diff --git a/src/core/udp.c b/src/core/udp.c
index ff4d6896..04d52b19 100644
--- a/src/core/udp.c
+++ b/src/core/udp.c
@@ -261,10 +261,12 @@ udp_input(struct pbuf *p, struct netif *inp)
 #endif /* LWIP_IGMP */
 #if IP_SOF_BROADCAST_RECV
             (broadcast && (pcb->so_options & SOF_BROADCAST) &&
-            ip_addr_netcmp(ipX_2_ip(&pcb->local_ip), ip_current_dest_addr(), &inp->netmask)))))) {
+             (ipX_addr_isany(0, &pcb->local_ip) ||
+              ip_addr_netcmp(ipX_2_ip(&pcb->local_ip), ip_current_dest_addr(), &inp->netmask))))))) {
 #else /* IP_SOF_BROADCAST_RECV */
             (broadcast &&
-            ip_addr_netcmp(ipX_2_ip(&pcb->local_ip), ip_current_dest_addr(), &inp->netmask)))))) {
+             (ipX_addr_isany(0, &pcb->local_ip) ||
+              ip_addr_netcmp(ipX_2_ip(&pcb->local_ip), ip_current_dest_addr(), &inp->netmask))))))) {
 #endif /* IP_SOF_BROADCAST_RECV */ 
           local_match = 1;
           if ((uncon_pcb == NULL) &&