diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index c74a19c0cf..6ee12648c4 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -45,6 +45,9 @@ CONFIG_LWIP_PPP_SUPPORT=y
 CONFIG_LWIP_PPP_PAP_SUPPORT=y
 CONFIG_LWIP_PPP_CHAP_SUPPORT=y
 
+# IPV6
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
+
 # SSL
 # Use 4kiB output buffer instead of default 16kiB
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index cfedd898cd..25e0ed8a7b 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -147,6 +147,9 @@ static void network_wlan_ip_event_handler(void *event_handler_arg, esp_event_bas
             ESP_LOGI("network", "GOT_IP");
             wifi_sta_connected = true;
             wifi_sta_disconn_reason = 0; // Success so clear error. (in case of new error will be replaced anyway)
+            ip_event_got_ip_t *event = (ip_event_got_ip_t *)event_data;
+            esp_netif_create_ip6_linklocal(event->esp_netif);
+
             #if MICROPY_HW_ENABLE_MDNS_QUERIES || MICROPY_HW_ENABLE_MDNS_RESPONDER
             if (!mdns_initialised) {
                 mdns_init();