diff --git a/src/Tooling/Extensions/AzureAIFoundry/Services/IMcpToolRegistrationService.cs b/src/Tooling/Extensions/AzureAIFoundry/Services/IMcpToolRegistrationService.cs
index bda8d035..78772067 100644
--- a/src/Tooling/Extensions/AzureAIFoundry/Services/IMcpToolRegistrationService.cs
+++ b/src/Tooling/Extensions/AzureAIFoundry/Services/IMcpToolRegistrationService.cs
@@ -21,12 +21,14 @@ public interface IMcpToolRegistrationService
     /// This is the primary method that customers should use in orchestrators with full authentication context.
     /// </summary>
     /// <param name="agentClient">The PersistentAgentsClient instance.</param>
+    /// <param name="agentInstanceId">The ID of the agent instance.</param>
     /// <param name="userAuthorization">User authorization context.</param>
     /// <param name="authHandlerName">Authentication Handler Name for use with the UserAuthorization System</param>
     /// <param name="turnContext">Turn context for the conversation.</param>
     /// <param name="authToken">Optional auth token to access the MCP servers.</param>
     Task AddToolServersToAgentAsync(
         PersistentAgentsClient agentClient,
+        string agentInstanceId,
         UserAuthorization userAuthorization,
         string authHandlerName,
         ITurnContext turnContext,
diff --git a/src/Tooling/Extensions/AzureAIFoundry/Services/McpToolRegistrationService.cs b/src/Tooling/Extensions/AzureAIFoundry/Services/McpToolRegistrationService.cs
index 4625c0c9..5fe3152d 100644
--- a/src/Tooling/Extensions/AzureAIFoundry/Services/McpToolRegistrationService.cs
+++ b/src/Tooling/Extensions/AzureAIFoundry/Services/McpToolRegistrationService.cs
@@ -92,9 +92,19 @@ public void AddToolServersToAgent(
         }
     }
 
-    /// <inheritdoc />
+    /// <summary>
+    /// Add new MCP servers to the agent by updating the PersistentAgentsClient asynchronously.
+    /// </summary>
+    /// <param name="agentClient">PersistentAgentsClient instance for the agent.</param>
+    /// <param name="agentInstanceId">The ID of the agent instance.</param>
+    /// <param name="userAuthorization">User authorization information.</param>
+    /// <param name="authHandlerName">The name of the authentication handler.</param>
+    /// <param name="turnContext">Turn context for the current request.</param>
+    /// <param name="authToken">Authentication token for MCP server access.</param>
+    /// <exception cref="ArgumentNullException"></exception>
     public async Task AddToolServersToAgentAsync(
         PersistentAgentsClient agentClient,
+        string agentInstanceId,
         UserAuthorization userAuthorization,
         string authHandlerName,
         ITurnContext turnContext,
@@ -110,15 +120,13 @@ public async Task AddToolServersToAgentAsync(
             authToken = await AgenticAuthenticationService.GetAgenticUserTokenAsync(userAuthorization, authHandlerName, turnContext, _configuration).ConfigureAwait(false);
         }
 
-        var agenticAppId = turnContext.Activity.Recipient.AgenticAppId;
-
         try
         {
             // Perform the (potentially async) work in a dedicated task to keep this synchronous signature.
-            var (toolDefinitions, toolResources) = GetMcpToolDefinitionsAndResourcesAsync(agenticAppId, authToken ?? string.Empty, turnContext).GetAwaiter().GetResult();
+            var (toolDefinitions, toolResources) = GetMcpToolDefinitionsAndResourcesAsync(agentInstanceId, authToken ?? string.Empty, turnContext).GetAwaiter().GetResult();
 
             agentClient.Administration.UpdateAgent(
-                agenticAppId,
+                agentInstanceId,
                 tools: toolDefinitions,
                 toolResources: toolResources);
 
@@ -126,7 +134,7 @@ public async Task AddToolServersToAgentAsync(
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Unhandled failure during MCP tool registration workflow for agent user {agenticAppId}", agenticAppId);
+            _logger.LogError(ex, "Unhandled failure during MCP tool registration workflow for agent user {agentInstanceId}", agentInstanceId);
             throw;
         }
     }