--- a/media/mtransport/ipc/StunAddrsRequestParent.cpp
+++ b/media/mtransport/ipc/StunAddrsRequestParent.cpp
@@ -13,29 +13,39 @@
 
 #include "../mdns_service/mdns_service.h"
 
 using namespace mozilla::ipc;
 
 namespace mozilla {
 namespace net {
 
-StunAddrsRequestParent::StunAddrsRequestParent()
-    : mIPCClosed(false), mMDNSService(nullptr) {
+StunAddrsRequestParent::StunAddrsRequestParent() : mIPCClosed(false) {
   NS_GetMainThread(getter_AddRefs(mMainThread));
 
   nsresult res;
   mSTSThread = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &res);
   MOZ_ASSERT(mSTSThread);
+
+  // This means that the mDNS service will continue running until shutdown
+  // once started. The StunAddrsRequestParent destructor does not run until
+  // shutdown anyway (see Bug 1569311), so there is not much we can do about
+  // this here. One option would be to add a check if there are no hostnames
+  // registered after UnregisterHostname is called, and if so, stop the mDNS
+  // service at that time (see Bug 1569955.)
+  if (!mSharedMDNSService) {
+    mSharedMDNSService = new MDNSServiceWrapper;
+  }
 }
 
 StunAddrsRequestParent::~StunAddrsRequestParent() {
-  if (mMDNSService) {
-    mdns_service_stop(mMDNSService);
-    mMDNSService = nullptr;
+  ASSERT_ON_THREAD(mMainThread);
+
+  if (mSharedMDNSService) {
+    mSharedMDNSService = nullptr;
   }
 }
 
 mozilla::ipc::IPCResult StunAddrsRequestParent::RecvGetStunAddrs() {
   ASSERT_ON_THREAD(mMainThread);
 
   if (mIPCClosed) {
     return IPC_OK();
@@ -52,39 +62,31 @@ mozilla::ipc::IPCResult StunAddrsRequest
 mozilla::ipc::IPCResult StunAddrsRequestParent::RecvRegisterMDNSHostname(
     const nsCString& aHostname, const nsCString& aAddress) {
   ASSERT_ON_THREAD(mMainThread);
 
   if (mIPCClosed) {
     return IPC_OK();
   }
 
-  if (!mMDNSService) {
-    mMDNSService = mdns_service_start();
-  }
-
-  if (mMDNSService) {
-    mdns_service_register_hostname(mMDNSService, aHostname.BeginReading(),
-                                   aAddress.BeginReading());
-  }
+  mSharedMDNSService->RegisterHostname(aHostname.BeginReading(),
+                                       aAddress.BeginReading());
 
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult StunAddrsRequestParent::RecvUnregisterMDNSHostname(
     const nsCString& aHostname) {
   ASSERT_ON_THREAD(mMainThread);
 
   if (mIPCClosed) {
     return IPC_OK();
   }
 
-  if (mMDNSService) {
-    mdns_service_unregister_hostname(mMDNSService, aHostname.BeginReading());
-  }
+  mSharedMDNSService->UnregisterHostname(aHostname.BeginReading());
 
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult StunAddrsRequestParent::Recv__delete__() {
   // see note below in ActorDestroy
   mIPCClosed = true;
   return IPC_OK();
@@ -123,13 +125,48 @@ void StunAddrsRequestParent::SendStunAdd
     // nothing to do: child probably crashed
     return;
   }
 
   // send the new addresses back to the child
   Unused << SendOnStunAddrsAvailable(addrs);
 }
 
+StaticRefPtr<StunAddrsRequestParent::MDNSServiceWrapper>
+    StunAddrsRequestParent::mSharedMDNSService;
+
 NS_IMPL_ADDREF(StunAddrsRequestParent)
 NS_IMPL_RELEASE(StunAddrsRequestParent)
 
+void StunAddrsRequestParent::MDNSServiceWrapper::RegisterHostname(
+    const char* hostname, const char* address) {
+  StartIfRequired();
+  if (mMDNSService) {
+    mdns_service_register_hostname(mMDNSService, hostname, address);
+  }
+}
+
+void StunAddrsRequestParent::MDNSServiceWrapper::UnregisterHostname(
+    const char* hostname) {
+  StartIfRequired();
+  if (mMDNSService) {
+    mdns_service_unregister_hostname(mMDNSService, hostname);
+  }
+}
+
+StunAddrsRequestParent::MDNSServiceWrapper::~MDNSServiceWrapper() {
+  if (mMDNSService) {
+    mdns_service_stop(mMDNSService);
+    mMDNSService = nullptr;
+  }
+}
+
+void StunAddrsRequestParent::MDNSServiceWrapper::StartIfRequired() {
+  if (!mMDNSService) {
+    mMDNSService = mdns_service_start();
+  }
+}
+
+NS_IMPL_ADDREF(StunAddrsRequestParent::MDNSServiceWrapper)
+NS_IMPL_RELEASE(StunAddrsRequestParent::MDNSServiceWrapper)
+
 }  // namespace net
 }  // namespace mozilla

--- a/media/mtransport/ipc/StunAddrsRequestParent.h
+++ b/media/mtransport/ipc/StunAddrsRequestParent.h
@@ -43,15 +43,34 @@ class StunAddrsRequestParent : public PS
   void SendStunAddrs_m(const NrIceStunAddrArray& addrs);
 
   ThreadSafeAutoRefCnt mRefCnt;
   NS_DECL_OWNINGTHREAD
 
  private:
   bool mIPCClosed;  // true if IPDL channel has been closed (child crash)
 
-  MDNSService* mMDNSService;
+  class MDNSServiceWrapper {
+   public:
+    void RegisterHostname(const char* hostname, const char* address);
+    void UnregisterHostname(const char* hostname);
+
+    NS_IMETHOD_(MozExternalRefCountType) AddRef();
+    NS_IMETHOD_(MozExternalRefCountType) Release();
+
+   protected:
+    ThreadSafeAutoRefCnt mRefCnt;
+    NS_DECL_OWNINGTHREAD
+
+   private:
+    virtual ~MDNSServiceWrapper();
+    void StartIfRequired();
+
+    MDNSService* mMDNSService = nullptr;
+  };
+
+  static StaticRefPtr<MDNSServiceWrapper> mSharedMDNSService;
 };
 
 }  // namespace net
 }  // namespace mozilla
 
 #endif  // mozilla_net_StunAddrsRequestParent_h