diff --git a/extensions/microsoft-foundry/index.ts b/extensions/microsoft-foundry/index.ts
index df0f86b27e5..f271c8e71e0 100644
--- a/extensions/microsoft-foundry/index.ts
+++ b/extensions/microsoft-foundry/index.ts
@@ -1079,7 +1079,12 @@ export default definePluginEntry({
               : typeof metadata?.modelId === "string" && metadata.modelId.trim().length > 0
                 ? metadata.modelId.trim()
                 : ctx.modelId;
-          const modelNameHint = resolveConfiguredModelNameHint(modelId, metadata?.modelName ?? ctx.model.name);
+          const activeModelNameHint =
+            ctx.modelId === metadata?.modelId ? metadata?.modelName : undefined;
+          const modelNameHint = resolveConfiguredModelNameHint(
+            modelId,
+            ctx.model.name ?? activeModelNameHint,
+          );
           const endpoint =
             typeof metadata?.endpoint === "string" && metadata.endpoint.trim().length > 0
               ? metadata.endpoint.trim()