diff --git a/cores/esp32/IPAddress.cpp b/cores/esp32/IPAddress.cpp
index 1fd2a08e9c5..299a625ff27 100644
--- a/cores/esp32/IPAddress.cpp
+++ b/cores/esp32/IPAddress.cpp
@@ -22,6 +22,10 @@
 #include "lwip/netif.h"
 #include "StreamString.h"
 
+#ifndef CONFIG_LWIP_IPV6
+#define IP6_NO_ZONE 0
+#endif
+
 IPAddress::IPAddress() : IPAddress(IPv4) {}
 
 IPAddress::IPAddress(IPType ip_type) {
@@ -387,6 +391,7 @@ IPAddress::IPAddress(const ip_addr_t *addr) {
 }
 
 void IPAddress::to_ip_addr_t(ip_addr_t *addr) const {
+#if CONFIG_LWIP_IPV6
   if (_type == IPv6) {
     addr->type = IPADDR_TYPE_V6;
     addr->u_addr.ip6.addr[0] = _address.dword[0];
@@ -400,9 +405,13 @@ void IPAddress::to_ip_addr_t(ip_addr_t *addr) const {
     addr->type = IPADDR_TYPE_V4;
     addr->u_addr.ip4.addr = _address.dword[IPADDRESS_V4_DWORD_INDEX];
   }
+#else
+  addr->addr = _address.dword[IPADDRESS_V4_DWORD_INDEX];
+#endif
 }
 
 IPAddress &IPAddress::from_ip_addr_t(const ip_addr_t *addr) {
+#if CONFIG_LWIP_IPV6
   if (addr->type == IPADDR_TYPE_V6) {
     _type = IPv6;
     _address.dword[0] = addr->u_addr.ip6.addr[0];
@@ -413,13 +422,21 @@ IPAddress &IPAddress::from_ip_addr_t(const ip_addr_t *addr) {
     _zone = addr->u_addr.ip6.zone;
 #endif /* LWIP_IPV6_SCOPES */
   } else {
+#endif
     _type = IPv4;
     memset(_address.bytes, 0, sizeof(_address.bytes));
+#if CONFIG_LWIP_IPV6
     _address.dword[IPADDRESS_V4_DWORD_INDEX] = addr->u_addr.ip4.addr;
+#else
+  _address.dword[IPADDRESS_V4_DWORD_INDEX] = addr->addr;
+#endif
+#if CONFIG_LWIP_IPV6
   }
+#endif
   return *this;
 }
 
+#if CONFIG_LWIP_IPV6
 esp_ip6_addr_type_t IPAddress::addr_type() const {
   if (_type != IPv6) {
     return ESP_IP6_ADDR_IS_UNKNOWN;
@@ -428,6 +445,9 @@ esp_ip6_addr_type_t IPAddress::addr_type() const {
   to_ip_addr_t(&addr);
   return esp_netif_ip6_get_addr_type((esp_ip6_addr_t *)(&(addr.u_addr.ip6)));
 }
+#endif
 
+#if CONFIG_LWIP_IPV6
 const IPAddress IN6ADDR_ANY(IPv6);
+#endif
 const IPAddress INADDR_NONE(0, 0, 0, 0);
diff --git a/cores/esp32/IPAddress.h b/cores/esp32/IPAddress.h
index b88aeed3026..923f4dd5ca6 100644
--- a/cores/esp32/IPAddress.h
+++ b/cores/esp32/IPAddress.h
@@ -24,6 +24,7 @@
 #include "WString.h"
 #include "lwip/ip_addr.h"
 #include "esp_netif_ip_addr.h"
+#include "sdkconfig.h"
 
 #define IPADDRESS_V4_BYTES_INDEX 12
 #define IPADDRESS_V4_DWORD_INDEX 3
@@ -115,7 +116,9 @@ class IPAddress : public Printable {
   IPAddress(const ip_addr_t *addr);
   void to_ip_addr_t(ip_addr_t *addr) const;
   IPAddress &from_ip_addr_t(const ip_addr_t *addr);
+#if CONFIG_LWIP_IPV6
   esp_ip6_addr_type_t addr_type() const;
+#endif
   uint8_t zone() const {
     return (type() == IPv6) ? _zone : 0;
   }
diff --git a/libraries/AsyncUDP/src/AsyncUDP.cpp b/libraries/AsyncUDP/src/AsyncUDP.cpp
index 5549276de44..48714bce5c5 100644
--- a/libraries/AsyncUDP/src/AsyncUDP.cpp
+++ b/libraries/AsyncUDP/src/AsyncUDP.cpp
@@ -328,25 +328,36 @@ AsyncUDPPacket::AsyncUDPPacket(AsyncUDP *udp, pbuf *pb, const ip_addr_t *raddr,
   pbuf_ref(_pb);
 
   //memcpy(&_remoteIp, raddr, sizeof(ip_addr_t));
+#if CONFIG_LWIP_IPV6
   _remoteIp.type = raddr->type;
   _localIp.type = _remoteIp.type;
+#endif
 
   eth_hdr *eth = NULL;
   udp_hdr *udphdr = (udp_hdr *)(_data - UDP_HLEN);
   _localPort = ntohs(udphdr->dest);
   _remotePort = ntohs(udphdr->src);
 
+#if CONFIG_LWIP_IPV6
   if (_remoteIp.type == IPADDR_TYPE_V4) {
+#endif
     eth = (eth_hdr *)(_data - UDP_HLEN - IP_HLEN - SIZEOF_ETH_HDR);
     struct ip_hdr *iphdr = (struct ip_hdr *)(_data - UDP_HLEN - IP_HLEN);
+#if CONFIG_LWIP_IPV6
     _localIp.u_addr.ip4.addr = iphdr->dest.addr;
     _remoteIp.u_addr.ip4.addr = iphdr->src.addr;
+#else
+  _localIp.addr = iphdr->dest.addr;
+  _remoteIp.addr = iphdr->src.addr;
+#endif
+#if CONFIG_LWIP_IPV6
   } else {
     eth = (eth_hdr *)(_data - UDP_HLEN - IP6_HLEN - SIZEOF_ETH_HDR);
     struct ip6_hdr *ip6hdr = (struct ip6_hdr *)(_data - UDP_HLEN - IP6_HLEN);
     memcpy(&_localIp.u_addr.ip6.addr, (uint8_t *)ip6hdr->dest.addr, 16);
     memcpy(&_remoteIp.u_addr.ip6.addr, (uint8_t *)ip6hdr->src.addr, 16);
   }
+#endif
   memcpy(_remoteMac, eth->src.addr, 6);
 
   struct netif *netif = NULL;
@@ -413,36 +424,48 @@ tcpip_adapter_if_t AsyncUDPPacket::interface() {
 }
 
 IPAddress AsyncUDPPacket::localIP() {
+#if CONFIG_LWIP_IPV6
   if (_localIp.type != IPADDR_TYPE_V4) {
     return IPAddress();
   }
   return IPAddress(_localIp.u_addr.ip4.addr);
+#else
+  return IPAddress(_localIp.addr);
+#endif
 }
 
+#if CONFIG_LWIP_IPV6
 IPAddress AsyncUDPPacket::localIPv6() {
   if (_localIp.type != IPADDR_TYPE_V6) {
     return IPAddress(IPv6);
   }
   return IPAddress(IPv6, (const uint8_t *)_localIp.u_addr.ip6.addr, _localIp.u_addr.ip6.zone);
 }
+#endif
 
 uint16_t AsyncUDPPacket::localPort() {
   return _localPort;
 }
 
 IPAddress AsyncUDPPacket::remoteIP() {
+#if CONFIG_LWIP_IPV6
   if (_remoteIp.type != IPADDR_TYPE_V4) {
     return IPAddress();
   }
   return IPAddress(_remoteIp.u_addr.ip4.addr);
+#else
+  return IPAddress(_remoteIp.addr);
+#endif
 }
 
+#if CONFIG_LWIP_IPV6
 IPAddress AsyncUDPPacket::remoteIPv6() {
   if (_remoteIp.type != IPADDR_TYPE_V6) {
     return IPAddress(IPv6);
   }
   return IPAddress(IPv6, (const uint8_t *)_remoteIp.u_addr.ip6.addr, _remoteIp.u_addr.ip6.zone);
 }
+#endif
 
 uint16_t AsyncUDPPacket::remotePort() {
   return _remotePort;
@@ -453,14 +476,22 @@ void AsyncUDPPacket::remoteMac(uint8_t *mac) {
 }
 
 bool AsyncUDPPacket::isIPv6() {
+#if CONFIG_LWIP_IPV6
   return _localIp.type == IPADDR_TYPE_V6;
+#else
+  return false;
+#endif
 }
 
 bool AsyncUDPPacket::isBroadcast() {
+#if CONFIG_LWIP_IPV6
   if (_localIp.type == IPADDR_TYPE_V6) {
     return false;
   }
   uint32_t ip = _localIp.u_addr.ip4.addr;
+#else
+  uint32_t ip = _localIp.addr;
+#endif
   return ip == 0xFFFFFFFF || ip == 0 || (ip & 0xFF000000) == 0xFF000000;
 }
 
@@ -571,6 +602,7 @@ static esp_err_t joinMulticastGroup(const ip_addr_t *addr, bool join, tcpip_adap
     }
     netif = (struct netif *)nif;
 
+#if CONFIG_LWIP_IPV6
     if (addr->type == IPADDR_TYPE_V4) {
       if (join) {
         if (igmp_joingroup_netif(netif, (const ip4_addr *)&(addr->u_addr.ip4))) {
@@ -592,7 +624,19 @@ static esp_err_t joinMulticastGroup(const ip_addr_t *addr, bool join, tcpip_adap
         }
       }
     }
+#else
+    if (join) {
+      if (igmp_joingroup_netif(netif, (const ip4_addr *)(addr))) {
+        return ESP_ERR_INVALID_STATE;
+      }
+    } else {
+      if (igmp_leavegroup_netif(netif, (const ip4_addr *)(addr))) {
+        return ESP_ERR_INVALID_STATE;
+      }
+    }
+#endif
   } else {
+#if CONFIG_LWIP_IPV6
     if (addr->type == IPADDR_TYPE_V4) {
       if (join) {
         if (igmp_joingroup((const ip4_addr *)IP4_ADDR_ANY, (const ip4_addr *)&(addr->u_addr.ip4))) {
@@ -614,6 +658,17 @@ static esp_err_t joinMulticastGroup(const ip_addr_t *addr, bool join, tcpip_adap
         }
       }
     }
+#else
+    if (join) {
+      if (igmp_joingroup((const ip4_addr *)IP4_ADDR_ANY, (const ip4_addr *)(addr))) {
+        return ESP_ERR_INVALID_STATE;
+      }
+    } else {
+      if (igmp_leavegroup((const ip4_addr *)IP4_ADDR_ANY, (const ip4_addr *)(addr))) {
+        return ESP_ERR_INVALID_STATE;
+      }
+    }
+#endif
   }
   return ESP_OK;
 }
@@ -722,18 +777,24 @@ size_t AsyncUDP::writeTo(const uint8_t *data, size_t len, const IPAddress addr,
 }
 
 IPAddress AsyncUDP::listenIP() {
+#if CONFIG_LWIP_IPV6
   if (!_pcb || _pcb->remote_ip.type != IPADDR_TYPE_V4) {
     return IPAddress();
   }
   return IPAddress(_pcb->remote_ip.u_addr.ip4.addr);
+#else
+  return IPAddress(_pcb->remote_ip.addr);
+#endif
 }
 
+#if CONFIG_LWIP_IPV6
 IPAddress AsyncUDP::listenIPv6() {
   if (!_pcb || _pcb->remote_ip.type != IPADDR_TYPE_V6) {
     return IPAddress(IPv6);
   }
   return IPAddress(IPv6, (const uint8_t *)_pcb->remote_ip.u_addr.ip6.addr, _pcb->remote_ip.u_addr.ip6.zone);
 }
+#endif
 
 size_t AsyncUDP::write(const uint8_t *data, size_t len) {
   return writeTo(data, len, &(_pcb->remote_ip), _pcb->remote_port);
diff --git a/libraries/AsyncUDP/src/AsyncUDP.h b/libraries/AsyncUDP/src/AsyncUDP.h
index 160fb7b1515..cd96d852542 100644
--- a/libraries/AsyncUDP/src/AsyncUDP.h
+++ b/libraries/AsyncUDP/src/AsyncUDP.h
@@ -79,10 +79,14 @@ class AsyncUDPPacket : public Stream {
   tcpip_adapter_if_t interface();
 
   IPAddress localIP();
+#if CONFIG_LWIP_IPV6
   IPAddress localIPv6();
+#endif
   uint16_t localPort();
   IPAddress remoteIP();
+#if CONFIG_LWIP_IPV6
   IPAddress remoteIPv6();
+#endif
   uint16_t remotePort();
   void remoteMac(uint8_t *mac);
 
@@ -146,7 +150,9 @@ class AsyncUDP : public Print {
   size_t broadcast(AsyncUDPMessage &message);
 
   IPAddress listenIP();
+#if CONFIG_LWIP_IPV6
   IPAddress listenIPv6();
+#endif
   bool connected();
   esp_err_t lastErr();
   operator bool();
diff --git a/libraries/Ethernet/src/ETH.cpp b/libraries/Ethernet/src/ETH.cpp
index e3f2197221c..1bd8f367c3d 100644
--- a/libraries/Ethernet/src/ETH.cpp
+++ b/libraries/Ethernet/src/ETH.cpp
@@ -74,6 +74,7 @@ static void onEthConnected(arduino_event_id_t event, arduino_event_info_t info)
       log_e("Could not find ETH interface with that handle!");
       return;
     }
+#if CONFIG_LWIP_IPV6
     if (_ethernets[index]->getStatusBits() & ESP_NETIF_WANT_IP6_BIT) {
       esp_err_t err = esp_netif_create_ip6_linklocal(_ethernets[index]->netif());
       if (err != ESP_OK) {
@@ -82,6 +83,7 @@ static void onEthConnected(arduino_event_id_t event, arduino_event_info_t info)
         log_v("Enabled IPv6 Link Local on %s", _ethernets[index]->desc());
       }
     }
+#endif
   }
 }
 
diff --git a/libraries/Network/src/NetworkClient.cpp b/libraries/Network/src/NetworkClient.cpp
index 0782b74f2a9..b560158e03d 100644
--- a/libraries/Network/src/NetworkClient.cpp
+++ b/libraries/Network/src/NetworkClient.cpp
@@ -210,6 +210,7 @@ int NetworkClient::connect(IPAddress ip, uint16_t port, int32_t timeout_ms) {
   _timeout = timeout_ms;
   int sockfd = -1;
 
+#if CONFIG_LWIP_IPV6
   if (ip.type() == IPv6) {
     struct sockaddr_in6 *tmpaddr = (struct sockaddr_in6 *)&serveraddr;
     sockfd = socket(AF_INET6, SOCK_STREAM, 0);
@@ -218,12 +219,15 @@ int NetworkClient::connect(IPAddress ip, uint16_t port, int32_t timeout_ms) {
     tmpaddr->sin6_port = htons(port);
     tmpaddr->sin6_scope_id = ip.zone();
   } else {
+#endif
     struct sockaddr_in *tmpaddr = (struct sockaddr_in *)&serveraddr;
     sockfd = socket(AF_INET, SOCK_STREAM, 0);
     tmpaddr->sin_family = AF_INET;
     tmpaddr->sin_addr.s_addr = ip;
     tmpaddr->sin_port = htons(port);
+#if CONFIG_LWIP_IPV6
   }
+#endif
   if (sockfd < 0) {
     log_e("socket: %d", errno);
     return 0;
@@ -590,6 +594,7 @@ IPAddress NetworkClient::remoteIP(int fd) const {
     return IPAddress((uint32_t)(s->sin_addr.s_addr));
   }
 
+#if CONFIG_LWIP_IPV6
   // IPv6, but it might be IPv4 mapped address
   if (((struct sockaddr *)&addr)->sa_family == AF_INET6) {
     struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)&addr;
@@ -600,6 +605,7 @@ IPAddress NetworkClient::remoteIP(int fd) const {
     }
   }
   log_e("NetworkClient::remoteIP Not AF_INET or AF_INET6?");
+#endif
   return (IPAddress(0, 0, 0, 0));
 }
 
@@ -630,6 +636,7 @@ IPAddress NetworkClient::localIP(int fd) const {
     return IPAddress((uint32_t)(s->sin_addr.s_addr));
   }
 
+#if CONFIG_LWIP_IPV6
   // IPv6, but it might be IPv4 mapped address
   if (((struct sockaddr *)&addr)->sa_family == AF_INET6) {
     struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)&addr;
@@ -640,6 +647,7 @@ IPAddress NetworkClient::localIP(int fd) const {
     }
   }
   log_e("NetworkClient::localIP Not AF_INET or AF_INET6?");
+#endif
   return (IPAddress(0, 0, 0, 0));
 }
 
diff --git a/libraries/Network/src/NetworkEvents.h b/libraries/Network/src/NetworkEvents.h
index 12e0222a79a..a84ced88496 100644
--- a/libraries/Network/src/NetworkEvents.h
+++ b/libraries/Network/src/NetworkEvents.h
@@ -24,8 +24,10 @@
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
 #include "esp_wifi_types.h"
 #include "esp_smartconfig.h"
+#if CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
 #include "network_provisioning/network_config.h"
 #endif
+#endif
 
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
 constexpr int WIFI_SCANNING_BIT = BIT0;
@@ -111,7 +113,9 @@ typedef union {
 #endif
 #if SOC_WIFI_SUPPORTED
   wifi_sta_config_t prov_cred_recv;
+#if CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
   network_prov_wifi_sta_fail_reason_t prov_fail_reason;
+#endif
   smartconfig_event_got_ssid_pswd_t sc_got_ssid_pswd;
 #endif
 } arduino_event_info_t;
diff --git a/libraries/Network/src/NetworkInterface.cpp b/libraries/Network/src/NetworkInterface.cpp
index e699d609ca1..4f310821204 100644
--- a/libraries/Network/src/NetworkInterface.cpp
+++ b/libraries/Network/src/NetworkInterface.cpp
@@ -106,6 +106,7 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
     } else if (_interface_id >= ESP_NETIF_ID_ETH && _interface_id < ESP_NETIF_ID_MAX) {
       arduino_event.event_id = ARDUINO_EVENT_ETH_LOST_IP;
     }
+#if CONFIG_LWIP_IPV6
   } else if (event_id == IP_EVENT_GOT_IP6) {
     ip_event_got_ip6_t *event = (ip_event_got_ip6_t *)event_data;
     esp_ip6_addr_type_t addr_type = esp_netif_ip6_get_addr_type(&event->ip6_info.ip);
@@ -134,6 +135,7 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
     } else if (_interface_id >= ESP_NETIF_ID_ETH && _interface_id < ESP_NETIF_ID_MAX) {
       arduino_event.event_id = ARDUINO_EVENT_ETH_GOT_IP6;
     }
+#endif /* CONFIG_LWIP_IPV6 */
 #if SOC_WIFI_SUPPORTED
   } else if (event_id == IP_EVENT_AP_STAIPASSIGNED && _interface_id == ESP_NETIF_ID_AP) {
     setStatusBits(ESP_NETIF_HAS_IP_BIT);
@@ -326,6 +328,7 @@ bool NetworkInterface::hasGlobalIPv6() const {
 }
 
 bool NetworkInterface::enableIPv6(bool en) {
+#if CONFIG_LWIP_IPV6
   if (en) {
     setStatusBits(ESP_NETIF_WANT_IP6_BIT);
     if (_esp_netif != NULL && connected()) {
@@ -341,6 +344,9 @@ bool NetworkInterface::enableIPv6(bool en) {
     clearStatusBits(ESP_NETIF_WANT_IP6_BIT);
   }
   return true;
+#else
+  return false;
+#endif
 }
 
 bool NetworkInterface::dnsIP(uint8_t dns_no, IPAddress ip) {
@@ -739,6 +745,7 @@ uint8_t NetworkInterface::subnetCIDR() const {
   return calculateSubnetCIDR(IPAddress(ip.netmask.addr));
 }
 
+#if CONFIG_LWIP_IPV6
 IPAddress NetworkInterface::linkLocalIPv6() const {
   if (_esp_netif == NULL) {
     return IPAddress(IPv6);
@@ -760,6 +767,7 @@ IPAddress NetworkInterface::globalIPv6() const {
   }
   return IPAddress(IPv6, (const uint8_t *)addr.addr, addr.zone);
 }
+#endif
 
 size_t NetworkInterface::printTo(Print &out) const {
   size_t bytes = 0;
@@ -834,6 +842,7 @@ size_t NetworkInterface::printTo(Print &out) const {
   bytes += out.print(dnsIP());
   bytes += out.println();
 
+#if CONFIG_LWIP_IPV6
   static const char *types[] = {"UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6"};
   esp_ip6_addr_t if_ip6[CONFIG_LWIP_IPV6_NUM_ADDRESSES];
   int v6addrs = esp_netif_get_all_ip6(_esp_netif, if_ip6);
@@ -845,6 +854,7 @@ size_t NetworkInterface::printTo(Print &out) const {
     bytes += out.print(types[esp_netif_ip6_get_addr_type(&if_ip6[i])]);
     bytes += out.println();
   }
+#endif
 
   return bytes;
 }
diff --git a/libraries/Network/src/NetworkInterface.h b/libraries/Network/src/NetworkInterface.h
index 323cf3bfc72..4f97181d4fd 100644
--- a/libraries/Network/src/NetworkInterface.h
+++ b/libraries/Network/src/NetworkInterface.h
@@ -70,8 +70,10 @@ class NetworkInterface : public Printable {
   IPAddress broadcastIP() const;
   IPAddress networkID() const;
   uint8_t subnetCIDR() const;
+#if CONFIG_LWIP_IPV6
   IPAddress linkLocalIPv6() const;
   IPAddress globalIPv6() const;
+#endif
 
   size_t printTo(Print &out) const;
 
diff --git a/libraries/Network/src/NetworkManager.cpp b/libraries/Network/src/NetworkManager.cpp
index 88059a60562..12276b2e242 100644
--- a/libraries/Network/src/NetworkManager.cpp
+++ b/libraries/Network/src/NetworkManager.cpp
@@ -87,6 +87,7 @@ int NetworkManager::hostByName(const char *aHostname, IPAddress &aResult) {
   memset(&hints, 0, sizeof(hints));
   hints.ai_socktype = SOCK_STREAM;
 
+#if CONFIG_LWIP_IPV6
   // **Workaround**
   // LWIP AF_UNSPEC always prefers IPv4 and doesn't check what network is
   // available. See https://github.com/espressif/esp-idf/issues/13255
@@ -106,22 +107,27 @@ int NetworkManager::hostByName(const char *aHostname, IPAddress &aResult) {
     }
   }
   // **End Workaround**
+#endif
 
   hints.ai_family = AF_UNSPEC;
   err = lwip_getaddrinfo(aHostname, servname, &hints, &res);
 
   if (err == ERR_OK) {
+#if CONFIG_LWIP_IPV6
     if (res->ai_family == AF_INET6) {
       struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)res->ai_addr;
       // As an array of u8_t
       aResult = IPAddress(IPv6, ipv6->sin6_addr.s6_addr);
       log_d("DNS found IPv6 %s", aResult.toString().c_str());
     } else {
+#endif
       struct sockaddr_in *ipv4 = (struct sockaddr_in *)res->ai_addr;
       // As a single u32_t
       aResult = IPAddress(ipv4->sin_addr.s_addr);
       log_d("DNS found IPv4 %s", aResult.toString().c_str());
+#if CONFIG_LWIP_IPV6
     }
+#endif
 
     lwip_freeaddrinfo(res);
     return 1;
diff --git a/libraries/Network/src/NetworkServer.cpp b/libraries/Network/src/NetworkServer.cpp
index 4609757255e..ce8ef952ea7 100644
--- a/libraries/Network/src/NetworkServer.cpp
+++ b/libraries/Network/src/NetworkServer.cpp
@@ -46,8 +46,13 @@ NetworkClient NetworkServer::accept() {
     client_sock = _accepted_sockfd;
     _accepted_sockfd = -1;
   } else {
+#if CONFIG_LWIP_IPV6
     struct sockaddr_in6 _client;
     int cs = sizeof(struct sockaddr_in6);
+#else
+    struct sockaddr_in _client;
+    int cs = sizeof(struct sockaddr_in);
+#endif
 #ifdef ESP_IDF_VERSION_MAJOR
     client_sock = lwip_accept(sockfd, (struct sockaddr *)&_client, (socklen_t *)&cs);
 #else
@@ -77,6 +82,7 @@ void NetworkServer::begin(uint16_t port, int enable) {
   if (port) {
     _port = port;
   }
+#if CONFIG_LWIP_IPV6
   struct sockaddr_in6 server;
   sockfd = socket(AF_INET6, SOCK_STREAM, 0);
   if (sockfd < 0) {
@@ -93,6 +99,18 @@ void NetworkServer::begin(uint16_t port, int enable) {
   }
   memset(server.sin6_addr.s6_addr, 0x0, 16);
   server.sin6_port = htons(_port);
+#else
+  struct sockaddr_in server;
+  memset(&server, 0x0, sizeof(sockaddr_in));
+  server.sin_family = AF_INET;
+  sockfd = socket(AF_INET, SOCK_STREAM, 0);
+  if (sockfd < 0) {
+    return;
+  }
+  setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
+  memcpy((uint8_t *)&(server.sin_addr.s_addr), (uint8_t *)&_addr[0], 4);
+  server.sin_port = htons(_port);
+#endif
   if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0) {
     return;
   }
@@ -117,8 +135,13 @@ bool NetworkServer::hasClient() {
   if (_accepted_sockfd >= 0) {
     return true;
   }
+#if CONFIG_LWIP_IPV6
   struct sockaddr_in6 _client;
   int cs = sizeof(struct sockaddr_in6);
+#else
+  struct sockaddr _client;
+  int cs = sizeof(struct sockaddr);
+#endif
 #ifdef ESP_IDF_VERSION_MAJOR
   _accepted_sockfd = lwip_accept(sockfd, (struct sockaddr *)&_client, (socklen_t *)&cs);
 #else
diff --git a/libraries/Network/src/NetworkUdp.cpp b/libraries/Network/src/NetworkUdp.cpp
index 73e0607c5ff..51579910ded 100644
--- a/libraries/Network/src/NetworkUdp.cpp
+++ b/libraries/Network/src/NetworkUdp.cpp
@@ -255,6 +255,7 @@ int NetworkUDP::endPacket() {
       log_e("could not send data: %d", errno);
       return 0;
     }
+#if LWIP_IPV6
   } else {
     struct sockaddr_in6 recipient;
     recipient.sin6_flowinfo = 0;
@@ -267,6 +268,7 @@ int NetworkUDP::endPacket() {
       log_e("could not send data: %d", errno);
       return 0;
     }
+#endif
   }
   return 1;
 }
@@ -336,12 +338,16 @@ int NetworkUDP::parsePacket() {
       remote_ip.from_ip_addr_t(&addr);
     }
     remote_port = ntohs(si_other.sin6_port);
+  } else {
+    remote_ip = ip_addr_any.u_addr.ip4.addr;
+    remote_port = 0;
   }
-#endif  // LWIP_IPV6=1
+#else
   else {
-    remote_ip = ip_addr_any.u_addr.ip4.addr;
+    remote_ip = ip_addr_any.addr;
     remote_port = 0;
   }
+#endif  // LWIP_IPV6=1
   if (len > 0) {
     rx_buffer = new (std::nothrow) cbuf(len);
     rx_buffer->write(buf, len);
diff --git a/libraries/NetworkClientSecure/src/ssl_client.cpp b/libraries/NetworkClientSecure/src/ssl_client.cpp
index 0f93f5cd7fe..19f75673133 100644
--- a/libraries/NetworkClientSecure/src/ssl_client.cpp
+++ b/libraries/NetworkClientSecure/src/ssl_client.cpp
@@ -83,6 +83,7 @@ int start_ssl_client(
 
   fcntl(ssl_client->socket, F_SETFL, fcntl(ssl_client->socket, F_GETFL, 0) | O_NONBLOCK);
   struct sockaddr_storage serv_addr = {};
+#if CONFIG_LWIP_IPV6
   if (domain == AF_INET6) {
     struct sockaddr_in6 *tmpaddr = (struct sockaddr_in6 *)&serv_addr;
     tmpaddr->sin6_family = AF_INET6;
@@ -92,11 +93,14 @@ int start_ssl_client(
     tmpaddr->sin6_port = htons(port);
     tmpaddr->sin6_scope_id = ip.zone();
   } else {
+#endif
     struct sockaddr_in *tmpaddr = (struct sockaddr_in *)&serv_addr;
     tmpaddr->sin_family = AF_INET;
     tmpaddr->sin_addr.s_addr = ip;
     tmpaddr->sin_port = htons(port);
+#if CONFIG_LWIP_IPV6
   }
+#endif
 
   if (timeout <= 0) {
     timeout = 30000;  // Milli seconds.
diff --git a/libraries/WiFi/src/AP.cpp b/libraries/WiFi/src/AP.cpp
index 9cba6e90f10..b713a6d3901 100644
--- a/libraries/WiFi/src/AP.cpp
+++ b/libraries/WiFi/src/AP.cpp
@@ -87,6 +87,7 @@ static void _onApArduinoEvent(arduino_event_t *ev) {
   }
   log_v("Arduino AP Event: %d - %s", ev->event_id, Network.eventName(ev->event_id));
   if (ev->event_id == ARDUINO_EVENT_WIFI_AP_START) {
+#if CONFIG_LWIP_IPV6
     if (_ap_network_if->getStatusBits() & ESP_NETIF_WANT_IP6_BIT) {
       esp_err_t err = esp_netif_create_ip6_linklocal(_ap_network_if->netif());
       if (err != ESP_OK) {
@@ -95,6 +96,7 @@ static void _onApArduinoEvent(arduino_event_t *ev) {
         log_v("Enabled IPv6 Link Local on %s", _ap_network_if->desc());
       }
     }
+#endif
   }
 }
 
diff --git a/libraries/WiFi/src/STA.cpp b/libraries/WiFi/src/STA.cpp
index 004ce161058..a7163ba0434 100644
--- a/libraries/WiFi/src/STA.cpp
+++ b/libraries/WiFi/src/STA.cpp
@@ -118,6 +118,7 @@ static void _onStaArduinoEvent(arduino_event_t *ev) {
     _sta_network_if->_setStatus(WL_STOPPED);
   } else if (ev->event_id == ARDUINO_EVENT_WIFI_STA_CONNECTED) {
     _sta_network_if->_setStatus(WL_IDLE_STATUS);
+#if CONFIG_LWIP_IPV6
     if (_sta_network_if->getStatusBits() & ESP_NETIF_WANT_IP6_BIT) {
       esp_err_t err = esp_netif_create_ip6_linklocal(_sta_network_if->netif());
       if (err != ESP_OK) {
@@ -126,6 +127,7 @@ static void _onStaArduinoEvent(arduino_event_t *ev) {
         log_v("Enabled IPv6 Link Local on %s", _sta_network_if->desc());
       }
     }
+#endif
   } else if (ev->event_id == ARDUINO_EVENT_WIFI_STA_DISCONNECTED) {
     uint8_t reason = ev->event_info.wifi_sta_disconnected.reason;
     // Reason 0 causes crash, use reason 1 (UNSPECIFIED) instead
diff --git a/libraries/WiFi/src/WiFiAP.cpp b/libraries/WiFi/src/WiFiAP.cpp
index 7282daac995..bb15ff44625 100644
--- a/libraries/WiFi/src/WiFiAP.cpp
+++ b/libraries/WiFi/src/WiFiAP.cpp
@@ -177,6 +177,7 @@ bool WiFiAPClass::softAPsetHostname(const char *hostname) {
   return AP.setHostname(hostname);
 }
 
+#if CONFIG_LWIP_IPV6
 /**
  * Enable IPv6 on the softAP interface.
  * @return true on success
@@ -193,5 +194,5 @@ bool WiFiAPClass::softAPenableIPv6(bool enable) {
 IPAddress WiFiAPClass::softAPlinkLocalIPv6() {
   return AP.linkLocalIPv6();
 }
-
+#endif
 #endif /* SOC_WIFI_SUPPORTED */
diff --git a/libraries/WiFi/src/WiFiAP.h b/libraries/WiFi/src/WiFiAP.h
index 4573e92ecf0..e80f91fa26c 100644
--- a/libraries/WiFi/src/WiFiAP.h
+++ b/libraries/WiFi/src/WiFiAP.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "soc/soc_caps.h"
+#include "sdkconfig.h"
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
 
 #include "esp_wifi_types.h"
@@ -100,8 +101,10 @@ class WiFiAPClass {
   IPAddress softAPSubnetMask();
   uint8_t softAPSubnetCIDR();
 
+#if CONFIG_LWIP_IPV6
   bool softAPenableIPv6(bool enable = true);
   IPAddress softAPlinkLocalIPv6();
+#endif
 
   const char *softAPgetHostname();
   bool softAPsetHostname(const char *hostname);
diff --git a/libraries/WiFi/src/WiFiGeneric.cpp b/libraries/WiFi/src/WiFiGeneric.cpp
index f3b27365cb6..a2697086e44 100644
--- a/libraries/WiFi/src/WiFiGeneric.cpp
+++ b/libraries/WiFi/src/WiFiGeneric.cpp
@@ -127,6 +127,7 @@ static void _arduino_event_cb(void *arg, esp_event_base_t event_base, int32_t ev
     log_v("SC Send Ack Done");
     arduino_event.event_id = ARDUINO_EVENT_SC_SEND_ACK_DONE;
 
+#if CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
     /*
 	 * Provisioning
 	 * */
@@ -160,6 +161,7 @@ static void _arduino_event_cb(void *arg, esp_event_base_t event_base, int32_t ev
   } else if (event_base == NETWORK_PROV_EVENT && event_id == NETWORK_PROV_WIFI_CRED_SUCCESS) {
     log_v("Provisioning Success!");
     arduino_event.event_id = ARDUINO_EVENT_PROV_CRED_SUCCESS;
+#endif
 #endif
   }
 
@@ -180,10 +182,12 @@ static bool initWiFiEvents() {
     return false;
   }
 
+#if CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
   if (esp_event_handler_instance_register(NETWORK_PROV_EVENT, ESP_EVENT_ANY_ID, &_arduino_event_cb, NULL, NULL)) {
     log_e("event_handler_instance_register for NETWORK_PROV_EVENT Failed!");
     return false;
   }
+#endif
 #endif
 
   return true;
@@ -201,10 +205,12 @@ static bool deinitWiFiEvents() {
     return false;
   }
 
+#if CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
   if (esp_event_handler_unregister(NETWORK_PROV_EVENT, ESP_EVENT_ANY_ID, &_arduino_event_cb)) {
     log_e("esp_event_handler_unregister for NETWORK_PROV_EVENT Failed!");
     return false;
   }
+#endif
 #endif
 
   return true;
diff --git a/libraries/WiFi/src/WiFiGeneric.h b/libraries/WiFi/src/WiFiGeneric.h
index fe929236a4b..27b41043abf 100644
--- a/libraries/WiFi/src/WiFiGeneric.h
+++ b/libraries/WiFi/src/WiFiGeneric.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "soc/soc_caps.h"
+#include "sdkconfig.h"
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
 
 #include "esp_err.h"
@@ -33,7 +34,9 @@
 #include "esp_smartconfig.h"
 #include "esp_netif_types.h"
 #include "esp_eth_driver.h"
+#if CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
 #include "network_provisioning/manager.h"
+#endif
 #include "lwip/ip_addr.h"
 
 #include "Network.h"
diff --git a/libraries/WiFi/src/WiFiMulti.cpp b/libraries/WiFi/src/WiFiMulti.cpp
index f99ce185252..c99bef5ac90 100644
--- a/libraries/WiFi/src/WiFiMulti.cpp
+++ b/libraries/WiFi/src/WiFiMulti.cpp
@@ -251,9 +251,11 @@ uint8_t WiFiMulti::run(uint32_t connectTimeout, bool scanHidden) {
         bestBSSID[4], bestBSSID[5], bestNetwork.ssid, bestChannel, bestNetworkDb
       );
 
+#if CONFIG_LWIP_IPV6
       if (ipv6_support == true) {
         WiFi.enableIPv6();
       }
+#endif
       WiFi.disconnect();
       delay(10);
       WiFi.begin(bestNetwork.ssid, (_bAllowOpenAP && bestNetworkSec == WIFI_AUTH_OPEN) ? NULL : bestNetwork.passphrase, bestChannel, bestBSSID);
@@ -318,9 +320,11 @@ uint8_t WiFiMulti::run(uint32_t connectTimeout, bool scanHidden) {
   return status;
 }
 
+#if CONFIG_LWIP_IPV6
 void WiFiMulti::enableIPv6(bool state) {
   ipv6_support = state;
 }
+#endif
 
 void WiFiMulti::markAsFailed(int32_t i) {
   APlist[i].hasFailed = true;
diff --git a/libraries/WiFi/src/WiFiMulti.h b/libraries/WiFi/src/WiFiMulti.h
index f3f823fa5d1..d818f77899f 100644
--- a/libraries/WiFi/src/WiFiMulti.h
+++ b/libraries/WiFi/src/WiFiMulti.h
@@ -47,7 +47,9 @@ class WiFiMulti {
 
   bool addAP(const char *ssid, const char *passphrase = NULL);
   uint8_t run(uint32_t connectTimeout = 5000, bool scanHidden = false);
+#if CONFIG_LWIP_IPV6
   void enableIPv6(bool state);
+#endif
 
   // Force (default: true) to only keep connected or to connect to an AP from the provided WiFiMulti list.
   // When bStrict is false, it will keep the last/current connected AP even if not in the WiFiMulti List.
diff --git a/libraries/WiFi/src/WiFiSTA.cpp b/libraries/WiFi/src/WiFiSTA.cpp
index 18c8b7207a4..db376ee3e69 100644
--- a/libraries/WiFi/src/WiFiSTA.cpp
+++ b/libraries/WiFi/src/WiFiSTA.cpp
@@ -386,6 +386,7 @@ int8_t WiFiSTAClass::RSSI(void) {
   return STA.RSSI();
 }
 
+#if CONFIG_LWIP_IPV6
 /**
  * Enable IPv6 on the station interface.
  * Should be called before WiFi.begin()
@@ -411,6 +412,7 @@ IPAddress WiFiSTAClass::linkLocalIPv6() {
 IPAddress WiFiSTAClass::globalIPv6() {
   return STA.globalIPv6();
 }
+#endif
 
 bool WiFiSTAClass::_smartConfigStarted = false;
 bool WiFiSTAClass::_smartConfigDone = false;
diff --git a/libraries/WiFi/src/WiFiSTA.h b/libraries/WiFi/src/WiFiSTA.h
index b3176ed17ca..96a3aa59dbd 100644
--- a/libraries/WiFi/src/WiFiSTA.h
+++ b/libraries/WiFi/src/WiFiSTA.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "soc/soc_caps.h"
+#include "sdkconfig.h"
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
 
 #include "WiFiType.h"
@@ -179,9 +180,11 @@ class WiFiSTAClass {
   IPAddress networkID();
   uint8_t subnetCIDR();
 
+#if CONFIG_LWIP_IPV6
   bool enableIPv6(bool en = true);
   IPAddress linkLocalIPv6();
   IPAddress globalIPv6();
+#endif
 
   // ----------------------------------------------------------------------------------------------
   // ---------------------------------------- Smart Config ----------------------------------------
diff --git a/libraries/WiFi/src/WiFiScan.h b/libraries/WiFi/src/WiFiScan.h
index 5e1097f3ae2..7afd26bb76a 100644
--- a/libraries/WiFi/src/WiFiScan.h
+++ b/libraries/WiFi/src/WiFiScan.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "soc/soc_caps.h"
+#include "sdkconfig.h"
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
 
 #include "WiFiType.h"
diff --git a/libraries/WiFi/src/WiFiType.h b/libraries/WiFi/src/WiFiType.h
index 83eed72f4cb..29af9ce2252 100644
--- a/libraries/WiFi/src/WiFiType.h
+++ b/libraries/WiFi/src/WiFiType.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include "soc/soc_caps.h"
+#include "sdkconfig.h"
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
 
 #include "esp_wifi_types.h"
diff --git a/libraries/WiFiProv/src/WiFiProv.cpp b/libraries/WiFiProv/src/WiFiProv.cpp
index f4008d44ded..55fbd473f88 100644
--- a/libraries/WiFiProv/src/WiFiProv.cpp
+++ b/libraries/WiFiProv/src/WiFiProv.cpp
@@ -18,7 +18,8 @@
 
 */
 #include "soc/soc_caps.h"
-#if SOC_WIFI_SUPPORTED
+#include "sdkconfig.h"
+#if SOC_WIFI_SUPPORTED && CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/libraries/WiFiProv/src/WiFiProv.h b/libraries/WiFiProv/src/WiFiProv.h
index 44dda82ad0e..a4a3397ed06 100644
--- a/libraries/WiFiProv/src/WiFiProv.h
+++ b/libraries/WiFiProv/src/WiFiProv.h
@@ -20,7 +20,8 @@
 #pragma once
 
 #include "soc/soc_caps.h"
-#if SOC_WIFI_SUPPORTED
+#include "sdkconfig.h"
+#if SOC_WIFI_SUPPORTED && CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
 
 #include "WiFi.h"
 #include "HardwareSerial.h"