diff --git a/ui/litellm-dashboard/src/components/guardrails/add_guardrail_form.tsx b/ui/litellm-dashboard/src/components/guardrails/add_guardrail_form.tsx
index b984c877e2d..4901ab8e999 100644
--- a/ui/litellm-dashboard/src/components/guardrails/add_guardrail_form.tsx
+++ b/ui/litellm-dashboard/src/components/guardrails/add_guardrail_form.tsx
@@ -860,6 +860,27 @@ const AddGuardrailForm: React.FC<AddGuardrailFormProps> = ({ visible, onClose, a
     );
   };
 
+  const getStepConfigs = () => {
+    if (shouldRenderContentFilterConfigSettings(selectedProvider)) {
+      return [
+        { title: "Basic Info", optional: false },
+        { title: "Default Categories", optional: false },
+        { title: "Patterns", optional: false },
+        { title: "Keywords", optional: false },
+      ];
+    }
+    if (shouldRenderPIIConfigSettings(selectedProvider)) {
+      return [
+        { title: "Basic Info", optional: false },
+        { title: "PII Configuration", optional: false },
+      ];
+    }
+    return [
+      { title: "Basic Info", optional: false },
+      { title: "Provider Configuration", optional: false },
+    ];
+  };
+
   const stepConfigs = getStepConfigs();
 
   return (
diff --git a/ui/litellm-dashboard/src/components/playground/complianceUI/ComplianceUI.tsx b/ui/litellm-dashboard/src/components/playground/complianceUI/ComplianceUI.tsx
index 083e3a827f8..efc5fb2ee42 100644
--- a/ui/litellm-dashboard/src/components/playground/complianceUI/ComplianceUI.tsx
+++ b/ui/litellm-dashboard/src/components/playground/complianceUI/ComplianceUI.tsx
@@ -581,9 +581,8 @@ export default function ComplianceUI({
           isMatch: false,
           triggeredBy: `Error: ${errorMessage}`,
           status: "complete" as const,
-        };
-      }
-      setTestResults([...updatedResults]);
+        }))
+      );
     }
     setIsRunning(false);
   }, [