diff --git a/matterforwindows b/matterforwindows
index f97cf2f..3e4936e 160000
--- a/matterforwindows
+++ b/matterforwindows
@@ -1 +1 @@
-Subproject commit f97cf2f95f4e4289f20963f17d6e5d212dfec199
+Subproject commit 3e4936e176f380de0f098284a3edca9c94945447
diff --git a/samples/ControllerApp/Services/ControllerSession.cs b/samples/ControllerApp/Services/ControllerSession.cs
index 00309d3..ee828ac 100644
--- a/samples/ControllerApp/Services/ControllerSession.cs
+++ b/samples/ControllerApp/Services/ControllerSession.cs
@@ -120,7 +120,7 @@ public async Task<AddedDeviceResult> CommissionBleAsync(
 
     public async Task<AddedDeviceResult> RecoverNodeAsync(ulong nodeId)
     {
-        CommissionedNode node = await RequireController().RecoverNodeAsync(nodeId);
+        CommissionedNode node = await new MatterControllerRecovery(RequireController()).RecoverNodeAsync(nodeId);
         return await RegisterCommissionedNodeAsync(node);
     }
 
@@ -259,7 +259,7 @@ private static async Task<CommissionedNode> RecoverAfterDuplicateFabricAsync(
     {
         try
         {
-            return await controller.RecoverNodeAsync(nodeId);
+            return await new MatterControllerRecovery(controller).RecoverNodeAsync(nodeId);
         }
         catch (Exception recoveryException)
         {
diff --git a/winrt/Matter.Windows.Controller.idl b/winrt/Matter.Windows.Controller.idl
index a50228b..6fd2be6 100644
--- a/winrt/Matter.Windows.Controller.idl
+++ b/winrt/Matter.Windows.Controller.idl
@@ -165,7 +165,6 @@ namespace Matter.Windows.Controller
         Windows.Foundation.IAsyncOperation<CommissionedNode> CommissionOnNetworkAsync(OnNetworkCommissioningParameters parameters);
         Windows.Foundation.IAsyncOperation<CommissionedNode> CommissionBleAsync(BleCommissioningParameters parameters);
         Windows.Foundation.Collections.IVectorView<CommissionedNode> CommissionedNodes { get; };
-        Windows.Foundation.IAsyncOperation<CommissionedNode> RecoverNodeAsync(UInt64 nodeId);
         Windows.Foundation.IAsyncAction RemoveNodeAsync(UInt64 nodeId);
         Windows.Foundation.IAsyncOperation<AttributeValue> ReadAttributeAsync(UInt64 nodeId, AttributePath path);
         Windows.Foundation.IAsyncAction WriteAttributeAsync(UInt64 nodeId, AttributePath path, Windows.Foundation.Collections.IPropertySet value);
@@ -180,4 +179,10 @@ namespace Matter.Windows.Controller
         BasicInformationCluster GetBasicInformationCluster(UInt64 nodeId, UInt16 endpointId);
         Windows.Foundation.IAsyncAction CloseAsync();
     };
+
+    runtimeclass MatterControllerRecovery
+    {
+        MatterControllerRecovery(MatterController controller);
+        Windows.Foundation.IAsyncOperation<CommissionedNode> RecoverNodeAsync(UInt64 nodeId);
+    };
 }
diff --git a/winrt/Matter.Windows.Controller.xml b/winrt/Matter.Windows.Controller.xml
index bfdbb15..ce5d078 100644
--- a/winrt/Matter.Windows.Controller.xml
+++ b/winrt/Matter.Windows.Controller.xml
@@ -258,7 +258,8 @@
       <summary>Commissions a device over Bluetooth LE.</summary><param name="parameters">BLE commissioning parameters.</param><returns>The persisted commissioned node.</returns>
     </member>
     <member name="P:Matter.Windows.Controller.MatterController.CommissionedNodes"><summary>Gets a snapshot of nodes persisted by this controller.</summary></member>
-    <member name="M:Matter.Windows.Controller.MatterController.RecoverNodeAsync(System.UInt64)"><summary>Verifies an existing operational node on the current fabric and restores it to the persisted node index.</summary><param name="nodeId">The node identifier previously assigned on this fabric.</param><returns>The recovered commissioned node.</returns></member>
+    <member name="M:Matter.Windows.Controller.MatterControllerRecovery.#ctor(Matter.Windows.Controller.MatterController)"><summary>Creates node recovery operations for a controller.</summary><param name="controller">The controller whose fabric contains the node.</param></member>
+    <member name="M:Matter.Windows.Controller.MatterControllerRecovery.RecoverNodeAsync(System.UInt64)"><summary>Verifies an existing operational node on the current fabric and restores it to the persisted node index.</summary><param name="nodeId">The node identifier previously assigned on this fabric.</param><returns>The recovered commissioned node.</returns></member>
     <member name="M:Matter.Windows.Controller.MatterController.RemoveNodeAsync(System.UInt64)"><summary>Starts removing a node from the fabric and persisted node index.</summary><param name="nodeId">The node identifier.</param><returns>An asynchronous action.</returns></member>
     <member name="M:Matter.Windows.Controller.MatterController.ReadAttributeAsync(System.UInt64,Matter.Windows.Controller.AttributePath)"><summary>Reads and recursively decodes a Matter attribute.</summary><param name="nodeId">The node identifier.</param><param name="path">The attribute path.</param><returns>The decoded attribute value.</returns></member>
     <member name="M:Matter.Windows.Controller.MatterController.WriteAttributeAsync(System.UInt64,Matter.Windows.Controller.AttributePath,System.Collections.Generic.IDictionary{System.String,System.Object})"><summary>Encodes and writes a generic Matter attribute value.</summary><param name="nodeId">The node identifier.</param><param name="path">The attribute path.</param><param name="value">The generic TLV property-set representation.</param><returns>An asynchronous action.</returns></member>
diff --git a/winrt/MatterControllerRecovery.h b/winrt/MatterControllerRecovery.h
new file mode 100644
index 0000000..5b5ae34
--- /dev/null
+++ b/winrt/MatterControllerRecovery.h
@@ -0,0 +1,2 @@
+#pragma once
+#include "ProjectionTypes.h"
diff --git a/winrt/Projection.cpp b/winrt/Projection.cpp
index 1b63b1d..c6ebafb 100644
--- a/winrt/Projection.cpp
+++ b/winrt/Projection.cpp
@@ -2487,13 +2487,6 @@ Windows::Foundation::Collections::IVectorView<Controller::CommissionedNode> Matt
     return single_threaded_vector(std::move(nodes)).GetView();
 }
 
-Windows::Foundation::IAsyncOperation<Controller::CommissionedNode> MatterController::RecoverNodeAsync(uint64_t nodeId)
-{
-    auto runtime = Runtime();
-    co_await resume_background();
-    co_return runtime->RecoverNode(nodeId);
-}
-
 Windows::Foundation::IAsyncAction MatterController::RemoveNodeAsync(uint64_t nodeId)
 {
     auto runtime = Runtime();
@@ -2625,6 +2618,22 @@ Controller::BasicInformationCluster MatterController::GetBasicInformationCluster
     return winrt::make<BasicInformationCluster>(Runtime(), nodeId, endpointId);
 }
 
+Windows::Foundation::IAsyncOperation<Controller::CommissionedNode>
+MatterControllerRecovery::RecoverNodeAsync(uint64_t nodeId)
+{
+    co_await resume_background();
+    co_return mRuntime->RecoverNode(nodeId);
+}
+
+MatterControllerRecovery::MatterControllerRecovery(Controller::MatterController controller)
+{
+    if (!controller)
+    {
+        throw hresult_invalid_argument(L"controller cannot be null.");
+    }
+    mRuntime = get_self<implementation::MatterController>(controller)->Runtime();
+}
+
 Windows::Foundation::IAsyncAction MatterController::CloseAsync()
 {
     std::shared_ptr<ControllerRuntime> runtime;
diff --git a/winrt/ProjectionTypes.h b/winrt/ProjectionTypes.h
index e694084..53401af 100644
--- a/winrt/ProjectionTypes.h
+++ b/winrt/ProjectionTypes.h
@@ -21,6 +21,7 @@
 #include "EventValue.g.h"
 #include "LevelControlCluster.g.h"
 #include "MatterController.g.h"
+#include "MatterControllerRecovery.g.h"
 #include "OnNetworkCommissioningParameters.g.h"
 #include "OnOffCluster.g.h"
 #include "TimedInteractionOptions.g.h"
@@ -334,7 +335,6 @@ struct MatterController : MatterControllerT<MatterController>
     Windows::Foundation::IAsyncOperation<Controller::CommissionedNode>
     CommissionBleAsync(Controller::BleCommissioningParameters parameters);
     Windows::Foundation::Collections::IVectorView<Controller::CommissionedNode> CommissionedNodes();
-    Windows::Foundation::IAsyncOperation<Controller::CommissionedNode> RecoverNodeAsync(uint64_t nodeId);
     Windows::Foundation::IAsyncAction RemoveNodeAsync(uint64_t nodeId);
     Windows::Foundation::IAsyncOperation<Controller::AttributeValue> ReadAttributeAsync(uint64_t nodeId,
                                                                                         Controller::AttributePath path);
@@ -360,16 +360,24 @@ struct MatterController : MatterControllerT<MatterController>
     Controller::LevelControlCluster GetLevelControlCluster(uint64_t nodeId, uint16_t endpointId);
     Controller::BasicInformationCluster GetBasicInformationCluster(uint64_t nodeId, uint16_t endpointId);
     Windows::Foundation::IAsyncAction CloseAsync();
-
-private:
     std::shared_ptr<ControllerRuntime> Runtime();
 
+private:
     std::mutex mRuntimeMutex;
     std::shared_ptr<ControllerRuntime> mRuntime;
     winrt::event<Windows::Foundation::TypedEventHandler<Controller::MatterController, Controller::CommissioningProgressEventArgs>>
         mCommissioningProgress;
 };
 
+struct MatterControllerRecovery : MatterControllerRecoveryT<MatterControllerRecovery>
+{
+    explicit MatterControllerRecovery(Controller::MatterController controller);
+    Windows::Foundation::IAsyncOperation<Controller::CommissionedNode> RecoverNodeAsync(uint64_t nodeId);
+
+private:
+    std::shared_ptr<ControllerRuntime> mRuntime;
+};
+
 } // namespace winrt::Matter::Windows::Controller::implementation
 
 namespace winrt::Matter::Windows::Controller::factory_implementation {
@@ -392,5 +400,7 @@ struct TimedInteractionOptions : TimedInteractionOptionsT<TimedInteractionOption
 {};
 struct MatterController : MatterControllerT<MatterController, implementation::MatterController>
 {};
+struct MatterControllerRecovery : MatterControllerRecoveryT<MatterControllerRecovery, implementation::MatterControllerRecovery>
+{};
 
 } // namespace winrt::Matter::Windows::Controller::factory_implementation