diff --git a/components/esp32/event.c b/components/esp32/event.c
index 53ffd642eb..366d0371f2 100644
--- a/components/esp32/event.c
+++ b/components/esp32/event.c
@@ -359,7 +359,7 @@ esp_err_t esp_event_init(system_event_cb_t cb, void *ctx)
 
     g_event_handler = xQueueCreate(CONFIG_WIFI_ENENT_QUEUE_SIZE, sizeof(system_event_t));
 
-    xTaskCreatePinnedToCore(esp_system_event_task, "eventTask", CONFIG_WIFI_EVENT_TASK_STACK_SIZE, NULL, 5, NULL, 0); // TODO: rearrange task priority
+    xTaskCreatePinnedToCore(esp_system_event_task, "eventTask", CONFIG_WIFI_EVENT_TASK_STACK_SIZE, NULL, configMAX_PRIORITIES-4, NULL, 0);
     return ESP_OK;
 }
 
diff --git a/components/esp32/wifi.c b/components/esp32/wifi.c
index 9900069759..a9d8981012 100644
--- a/components/esp32/wifi.c
+++ b/components/esp32/wifi.c
@@ -107,7 +107,7 @@ esp_err_t esp_wifi_startup(wifi_startup_cb_t cb, void *ctx)
     startup_cb = cb;
     startup_ctx = ctx;
 
-    xTaskCreatePinnedToCore(esp_wifi_task, "wifiTask", 4096, NULL, 5, NULL, 0);// TODO: rearrange task priority
+    xTaskCreatePinnedToCore(esp_wifi_task, "wifiTask", 4096, NULL, configMAX_PRIORITIES-7, NULL, 0);
 
     return ESP_OK;
 }
diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index 26d3c8dcbd..9fe047faba 100755
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -330,7 +330,7 @@ extern unsigned char misc_prof_get_tcp_snd_buf(void);
  * The priority value itself is platform-dependent, but is passed to
  * sys_thread_new() when the thread is created.
  */
-#define TCPIP_THREAD_PRIO               (configMAX_PRIORITIES-5)
+#define TCPIP_THREAD_PRIO               (configMAX_PRIORITIES-7)
 
 /**
  * TCPIP_MBOX_SIZE: The mailbox size for the tcpip thread messages