diff --git a/libraries/ESP8266mDNS/src/LEAmDNS_Control.cpp b/libraries/ESP8266mDNS/src/LEAmDNS_Control.cpp
index f575983ef7..8c2e227f01 100644
--- a/libraries/ESP8266mDNS/src/LEAmDNS_Control.cpp
+++ b/libraries/ESP8266mDNS/src/LEAmDNS_Control.cpp
@@ -234,6 +234,14 @@ namespace MDNSImplementation
                         = (((ProbingStatus_Done == pService->m_ProbeInformation.m_ProbingStatus))
                                ? _replyMaskForService(questionRR.m_Header, *pService, 0)
                                : 0);
+
+                    if (pService->m_ProbeInformation.m_ProbingStatus != ProbingStatus_InProgress)
+                    {
+                        // reply with service description (check MDNSResponder::_announce() comments)
+                        u8ReplyMaskForQuestion |= (ContentFlag_SRV | ContentFlag_TXT
+                                                   | ContentFlag_PTR_NAME | ContentFlag_PTR_TYPE);
+                    }
+
                     u8HostOrServiceReplies |= (pService->m_u8ReplyMask |= u8ReplyMaskForQuestion);
                     DEBUG_EX_INFO(if (u8ReplyMaskForQuestion) {
                         DEBUG_OUTPUT.printf_P(