diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c
index 18c23d3fd6..d793a1ffcc 100644
--- a/components/mdns/mdns.c
+++ b/components/mdns/mdns.c
@@ -1540,6 +1540,8 @@ static bool _mdns_service_match_ptr_question(const mdns_service_t *service, cons
     if (!_mdns_service_match(service, question->service, question->proto, NULL)) {
         return false;
     }
+    // The question parser stores anything before _type._proto in question->host
+    // So the question->host can be subtype or instance name based on its content
     if (question->sub) {
         mdns_subtype_t *subtype = service->subtype;
         while (subtype) {
@@ -1550,6 +1552,11 @@ static bool _mdns_service_match_ptr_question(const mdns_service_t *service, cons
         }
         return false;
     }
+    if (question->host) {
+        if (strcasecmp(service->instance, question->host) != 0) {
+            return false;
+        }
+    }
     return true;
 }