diff --git a/src/plugin-handlers/prometheus-agent-config-builder.ts b/src/plugin-handlers/prometheus-agent-config-builder.ts
index 61a33e74f..63824f95b 100644
--- a/src/plugin-handlers/prometheus-agent-config-builder.ts
+++ b/src/plugin-handlers/prometheus-agent-config-builder.ts
@@ -39,10 +39,14 @@ export async function buildPrometheusAgentConfig(params: {
     connectedProviders: connectedProviders ?? undefined,
   });
 
+  const configuredPrometheusModel =
+    params.pluginPrometheusOverride?.model ?? categoryConfig?.model;
+
   const modelResolution = resolveModelPipeline({
     intent: {
-      uiSelectedModel: params.currentModel,
-      userModel: params.pluginPrometheusOverride?.model ?? categoryConfig?.model,
+      uiSelectedModel: configuredPrometheusModel ? undefined : params.currentModel,
+      userModel: params.pluginPrometheusOverride?.model,
+      categoryDefaultModel: categoryConfig?.model,
     },
     constraints: { availableModels },
     policy: {