diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailFormField.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailFormField.tsx
index 3b76c9e8016..100d23ad5bb 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailFormField.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/GuardrailFormField.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { CircleHelp } from "lucide-react";
-import React, { useId } from "react";
+import React, { useEffect, useId } from "react";
 import { useController, type Control, type ControllerRenderProps, type RegisterOptions } from "react-hook-form";
 import { Field, FieldDescription, FieldError, FieldLabel } from "@/components/ui/field";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
@@ -9,6 +9,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
 import {
   getLoggingOnlyScopeOptions,
   modeIncludesLoggingOnly,
+  normalizeLoggingOnlyScopeChoice,
   type LoggingOnlyScopeChoice,
 } from "./guardrail_info_helpers";
 
@@ -44,6 +45,9 @@ export const asText = (value: unknown): string => {
   return "";
 };
 
+const isLoggingOnlyScopeChoice = (value: unknown): value is LoggingOnlyScopeChoice =>
+  value === "default" || value === "input" || value === "output" || value === "both";
+
 export const asStringArray = (value: unknown): string[] => {
   if (Array.isArray(value)) return value.filter((entry): entry is string => typeof entry === "string");
   if (typeof value === "string" && value !== "") return [value];
@@ -137,6 +141,12 @@ export const LoggingOnlyScopeSelect: React.FC<{
   const { id, value, onChange, "aria-invalid": ariaInvalid, "aria-describedby": ariaDescribedBy } = control;
   const items = getLoggingOnlyScopeOptions(directionalScopeSupported);
 
+  useEffect(() => {
+    const currentChoice = isLoggingOnlyScopeChoice(value) ? value : "default";
+    const choice = normalizeLoggingOnlyScopeChoice(currentChoice, directionalScopeSupported);
+    if (choice !== value) onChange(choice);
+  }, [value, directionalScopeSupported, onChange]);
+
   return (
     <Select items={items} value={asText(value) || "default"} onValueChange={onChange}>
       <SelectTrigger id={id} aria-invalid={ariaInvalid} aria-describedby={ariaDescribedBy} className="w-full">
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx
index 0979a1e27a6..1cf17c89d51 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/add_guardrail_form.tsx
@@ -18,7 +18,6 @@ import {
   getSupportedModesForProvider,
   guardrail_provider_map,
   modeIncludesLoggingOnly,
-  normalizeLoggingOnlyScopeChoice,
   populateGuardrailProviderMap,
   populateGuardrailProviders,
   shouldRenderContentFilterConfigSettings,
@@ -246,12 +245,6 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
   }, [selectedProvider]);
   const directionalScopeSupported = supportsDirectionalLoggingOnlyScope(guardrailSettings, selectedProvider);
 
-  useEffect(() => {
-    const scopeChoice = form.getValues("logging_only_scope_choice");
-    const normalizedScopeChoice = normalizeLoggingOnlyScopeChoice(scopeChoice, directionalScopeSupported);
-    if (normalizedScopeChoice !== scopeChoice) form.setValue("logging_only_scope_choice", normalizedScopeChoice);
-  }, [directionalScopeSupported, form]);
-
   // Fetch guardrail UI settings + provider params on mount / accessToken change
   useEffect(() => {
     if (!accessToken) return;
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx
index aa8515874b0..73d9fb8123e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/guardrails/_components/guardrail_info.tsx
@@ -39,7 +39,6 @@ import {
   getGuardrailLogoAndName,
   guardrail_provider_map,
   loggingOnlyScopeToChoice,
-  normalizeLoggingOnlyScopeChoice,
   skipSystemMessageToChoice,
   skipToolMessageToChoice,
   supportsDirectionalLoggingOnlyScope,
@@ -246,12 +245,6 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
     }
   }, [guardrailData, guardrailProviderSpecificParams, form]);
 
-  useEffect(() => {
-    const scopeChoice = form.getValues("logging_only_scope_choice");
-    const normalizedScopeChoice = normalizeLoggingOnlyScopeChoice(scopeChoice, directionalScopeSupported);
-    if (normalizedScopeChoice !== scopeChoice) form.setValue("logging_only_scope_choice", normalizedScopeChoice);
-  }, [directionalScopeSupported, form, guardrailData]);
-
   const resetToolPermissionEditor = useCallback(() => {
     if (guardrailData?.litellm_params?.guardrail === "tool_permission") {
       setToolPermissionConfig({
@@ -525,7 +518,6 @@ const GuardrailInfoView: React.FC<GuardrailInfoProps> = ({ guardrailId, onClose,
 
   const isConfigGuardrail = guardrailData.guardrail_definition_location === "config";
 
-  /* eslint-disable max-lines -- keep edit-form scope normalization with its owning view */
   return (
     <div className="p-4">
       <div>