diff --git a/packages/server/src/server/agent/option-controls.ts b/packages/server/src/server/agent/option-controls.ts
index 1fd13cb8f6..e8e9ef03b3 100644
--- a/packages/server/src/server/agent/option-controls.ts
+++ b/packages/server/src/server/agent/option-controls.ts
@@ -183,12 +183,9 @@ export function foldProfileFeatureValues<T extends ProfileOptionFields>(input: {
     if (featureValues) return { ...rest, options: { ...featureValues, ...ownOptions } };
     return ownOptions ? { ...rest, options: ownOptions } : rest;
   }
-  const base =
-    rest.options !== undefined
-      ? ownOptions
-      : stored?.provider === rest.provider
-        ? convert(provider, stored?.options)
-        : undefined;
+  const storedOptions =
+    stored?.provider === rest.provider ? convert(provider, stored?.options) : undefined;
+  const base = rest.options !== undefined ? ownOptions : storedOptions;
   const options = applyProviderOptionsPatch({ options: base, patch: featureValues ?? {} });
   return Object.keys(options).length > 0 ? { ...rest, options } : { ...rest, options: undefined };
 }
diff --git a/packages/server/src/server/agent/provider-registry.test.ts b/packages/server/src/server/agent/provider-registry.test.ts
index 6621a92046..f1fda21dff 100644
--- a/packages/server/src/server/agent/provider-registry.test.ts
+++ b/packages/server/src/server/agent/provider-registry.test.ts
@@ -5,7 +5,6 @@ import { createTestLogger } from "../../test-utils/test-logger.js";
 import type {
   AgentClient,
   AgentDraftControls,
-  AgentOptionControl,
   AgentModelDefinition,
   AgentMode,
   AgentSessionConfig,