diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c
index 4ad1da3ee..d4fbd5949 100644
--- a/components/mdns/mdns.c
+++ b/components/mdns/mdns.c
@@ -3964,6 +3964,7 @@ static esp_err_t _mdns_service_task_stop()
 {
     MDNS_SERVICE_LOCK();
     _mdns_stop_timer();
+    MDNS_SERVICE_UNLOCK();
     if (_mdns_service_task_handle) {
         mdns_action_t action;
         mdns_action_t * a = &action;
@@ -3976,7 +3977,6 @@ static esp_err_t _mdns_service_task_stop()
             vTaskDelay(10 / portTICK_PERIOD_MS);
         }
     }
-    MDNS_SERVICE_UNLOCK();
     return ESP_OK;
 }
 
@@ -4066,8 +4066,8 @@ void mdns_free()
     if (!_mdns_server) {
         return;
     }
-    _mdns_service_task_stop();
     mdns_service_remove_all(_mdns_server);
+    _mdns_service_task_stop();
     for (i=0; i<TCPIP_ADAPTER_IF_MAX; i++) {
         for (j=0; j<MDNS_IP_PROTOCOL_MAX; j++) {
             _mdns_pcb_deinit(i, j);