diff --git a/components/lwip/lwip b/components/lwip/lwip
index 9bad641bc7..705dd71d46 160000
--- a/components/lwip/lwip
+++ b/components/lwip/lwip
@@ -1 +1 @@
-Subproject commit 9bad641bc7378d2eb1ba84834baafaf119135206
+Subproject commit 705dd71d46779bf29653f1f1d7b1af5a09fb2aa7
diff --git a/components/lwip/port/esp32/include/lwipopts.h b/components/lwip/port/esp32/include/lwipopts.h
index 32b66b5eda..2a9d29fedc 100644
--- a/components/lwip/port/esp32/include/lwipopts.h
+++ b/components/lwip/port/esp32/include/lwipopts.h
@@ -344,7 +344,9 @@ extern "C" {
 /* Since for embedded devices it's not that hard to miss a discover packet, so lower
  * the discover retry backoff time from (2,4,8,16,32,60,60)s to (500m,1,2,4,8,15,15)s.
  */
-#define DHCP_REQUEST_TIMEOUT_SEQUENCE(tries)   (( (tries) < 6 ? 1 << (tries) : 60) * 250)
+#define DHCP_REQUEST_TIMEOUT_SEQUENCE(state, tries)   (state == DHCP_STATE_REQUESTING ? \
+                                                       (uint16_t)(1 * 1000) : \
+                                                       (uint16_t)(((tries) < 6 ? 1 << (tries) : 60) * 250))
 
 static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 {
@@ -1422,9 +1424,25 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 #ifdef CONFIG_LWIP_TIMERS_ONDEMAND
 #define ESP_LWIP_IGMP_TIMERS_ONDEMAND   1
 #define ESP_LWIP_MLD6_TIMERS_ONDEMAND   1
+#define ESP_LWIP_DHCP_FINE_TIMERS_ONDEMAND 1
+#define ESP_LWIP_DNS_TIMERS_ONDEMAND       1
+#if IP_REASSEMBLY
+#define ESP_LWIP_IP4_REASSEMBLY_TIMERS_ONDEMAND 1
+#endif /* IP_REASSEMBLY */
+#if LWIP_IPV6_REASS
+#define ESP_LWIP_IP6_REASSEMBLY_TIMERS_ONDEMAND 1
+#endif /* LWIP_IPV6_REASS */
 #else
 #define ESP_LWIP_IGMP_TIMERS_ONDEMAND   0
 #define ESP_LWIP_MLD6_TIMERS_ONDEMAND   0
+#define ESP_LWIP_DHCP_FINE_TIMERS_ONDEMAND 0
+#define ESP_LWIP_DNS_TIMERS_ONDEMAND    0
+#if IP_REASSEMBLY
+#define ESP_LWIP_IP4_REASSEMBLY_TIMERS_ONDEMAND 0
+#endif /* IP_REASSEMBLY */
+#if LWIP_IPV6_REASS
+#define ESP_LWIP_IP6_REASSEMBLY_TIMERS_ONDEMAND 0
+#endif /* LWIP_IPV6_REASS */
 #endif
 
 /**