diff --git a/components/mdns/Kconfig b/components/mdns/Kconfig
index d19315b9f80..7252e861960 100644
--- a/components/mdns/Kconfig
+++ b/components/mdns/Kconfig
@@ -10,13 +10,11 @@ menu "mDNS"
 
     config MDNS_MAX_SERVICES
         int "Max number of services"
-        range 1 64
         default 10
         help
             Services take up a certain amount of memory, and allowing fewer
             services to be open at the same time conserves memory. Specify
-            the maximum amount of services here. The valid value is from 1
-            to 64.
+            the maximum amount of services here.
 
     config MDNS_TASK_PRIORITY
         int "mDNS task priority"
diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c
index b6db1de5ec6..d990e771901 100644
--- a/components/mdns/mdns.c
+++ b/components/mdns/mdns.c
@@ -5595,12 +5595,18 @@ esp_err_t mdns_hostname_set(const char *hostname)
 
 esp_err_t mdns_hostname_get(char *hostname)
 {
-    if (!_mdns_server || !hostname) {
+    if (!hostname) {
         return ESP_ERR_INVALID_ARG;
     }
+
+    if (!_mdns_server || !_mdns_server->hostname) {
+        return ESP_ERR_INVALID_STATE;
+    }
+
     MDNS_SERVICE_LOCK();
     strncpy(hostname, _mdns_server->hostname, strnlen(_mdns_server->hostname, MDNS_NAME_BUF_LEN));
     MDNS_SERVICE_UNLOCK();
+
     return ESP_OK;
 }
 
@@ -5900,10 +5906,14 @@ static mdns_result_t *_mdns_lookup_service(const char *instance, const char *ser
                 item->esp_netif = NULL;
                 item->ttl = _str_null_or_empty(instance) ? MDNS_ANSWER_PTR_TTL : MDNS_ANSWER_SRV_TTL;
                 item->ip_protocol = MDNS_IP_PROTOCOL_MAX;
-                item->instance_name = strndup(srv->instance, MDNS_NAME_BUF_LEN - 1);
-                if (!item->instance_name) {
-                    HOOK_MALLOC_FAILED;
-                    goto handle_error;
+                if (srv->instance) {
+                    item->instance_name = strndup(srv->instance, MDNS_NAME_BUF_LEN - 1);
+                    if (!item->instance_name) {
+                        HOOK_MALLOC_FAILED;
+                        goto handle_error;
+                    }
+                } else {
+                    item->instance_name = NULL;
                 }
                 item->service_type = strndup(srv->service, MDNS_NAME_BUF_LEN - 1);
                 if (!item->service_type) {