diff --git a/src/controller/CHIPCommissionableNodeController.cpp b/src/controller/CHIPCommissionableNodeController.cpp
index d127e2abee050e..49ae43d14e30a4 100644
--- a/src/controller/CHIPCommissionableNodeController.cpp
+++ b/src/controller/CHIPCommissionableNodeController.cpp
@@ -35,7 +35,7 @@ CHIP_ERROR CommissionableNodeController::DiscoverCommissioners(Dnssd::DiscoveryF
     if (mResolver == nullptr)
     {
 #if CONFIG_DEVICE_LAYER
-        ReturnErrorOnFailure(mDNSResolver.Init(&DeviceLayer::InetLayer()));
+        ReturnErrorOnFailure(mDNSResolver.Init(DeviceLayer::UDPEndPointManager()));
 #endif
         mDNSResolver.SetResolverDelegate(this);
         return mDNSResolver.FindCommissioners(discoveryFilter);
@@ -43,7 +43,7 @@ CHIP_ERROR CommissionableNodeController::DiscoverCommissioners(Dnssd::DiscoveryF
     else
     {
 #if CONFIG_DEVICE_LAYER
-        ReturnErrorOnFailure(mResolver->Init(&DeviceLayer::InetLayer()));
+        ReturnErrorOnFailure(mResolver->Init(DeviceLayer::UDPEndPointManager()));
 #endif
         return mResolver->FindCommissioners(discoveryFilter);
     }
diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp
index 633a9445ef75e6..cabf6a4b89ecab 100644
--- a/src/controller/CHIPDeviceControllerFactory.cpp
+++ b/src/controller/CHIPDeviceControllerFactory.cpp
@@ -153,7 +153,7 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState(FactoryInitParams params)
     ReturnErrorOnFailure(chip::app::InteractionModelEngine::GetInstance()->Init(stateParams.exchangeMgr, stateParams.imDelegate));
 
 #if CHIP_DEVICE_CONFIG_ENABLE_DNSSD
-    ReturnErrorOnFailure(Dnssd::Resolver::Instance().Init(stateParams.inetLayer));
+    ReturnErrorOnFailure(Dnssd::Resolver::Instance().Init(stateParams.udpEndPointManager));
 #endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD
 
     // store the system state
diff --git a/src/lib/dnssd/ResolverProxy.h b/src/lib/dnssd/ResolverProxy.h
index 88ac1d407a1784..e7ce4fa10c408f 100644
--- a/src/lib/dnssd/ResolverProxy.h
+++ b/src/lib/dnssd/ResolverProxy.h
@@ -63,9 +63,9 @@ class ResolverProxy : public Resolver
     ResolverProxy() {}
 
     // Resolver interface.
-    CHIP_ERROR Init(Inet::InetLayer * inetLayer = nullptr) override
+    CHIP_ERROR Init(Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPoint = nullptr) override
     {
-        ReturnErrorOnFailure(chip::Dnssd::Resolver::Instance().Init(inetLayer));
+        ReturnErrorOnFailure(chip::Dnssd::Resolver::Instance().Init(udpEndPoint));
         VerifyOrReturnError(mDelegate == nullptr, CHIP_ERROR_INCORRECT_STATE);
         mDelegate = chip::Platform::New<ResolverDelegateProxy>();
         return CHIP_NO_ERROR;