diff --git a/src/resources/extensions/sf/auto-model-selection.ts b/src/resources/extensions/sf/auto-model-selection.ts
index a66833fe7..40beab3d3 100644
--- a/src/resources/extensions/sf/auto-model-selection.ts
+++ b/src/resources/extensions/sf/auto-model-selection.ts
@@ -841,11 +841,13 @@ export async function selectAndApplyModel(
 			appliedModel === null &&
 			(unitType === "subagent" || unitType.startsWith("subagent/")) &&
 			prefs &&
-			isProviderAllowedForAdvisor(ctx.model?.provider ?? "", prefs)
+			ctx.model &&
+			isProviderAllowedForAdvisor(ctx.model.provider, prefs)
 		) {
-			const ok = await pi.setModel(ctx.model, { persist: persistModelChanges });
+			const sessionModel = ctx.model;
+			const ok = await pi.setModel(sessionModel, { persist: persistModelChanges });
 			if (ok) {
-				appliedModel = ctx.model as Model<Api>;
+				appliedModel = sessionModel;
 				reapplyThinkingLevel(pi, autoModeStartThinkingLevel);
 			}
 		}