diff --git a/libraries/ESP8266WiFi/src/include/UdpContext.h b/libraries/ESP8266WiFi/src/include/UdpContext.h
index e1be24c13b..3f8623a0d4 100644
--- a/libraries/ESP8266WiFi/src/include/UdpContext.h
+++ b/libraries/ESP8266WiFi/src/include/UdpContext.h
@@ -51,6 +51,12 @@ class UdpContext
     , _tx_buf_offset(0)
     {
         _pcb = udp_new();
+// Defaults to IPADDR_TYPE_V4 (_pcb initialized with all zeroes)
+#if LWIP_IPV4 && LWIP_IPV6
+        _pcb->local_ip.type = IPADDR_TYPE_ANY;
+#elif LWIP_IPV6
+        _pcb->local_ip.type = IPADDR_TYPE_V6;
+#endif
 #ifdef LWIP_MAYBE_XCC
         _mcast_ttl = 1;
 #endif