diff --git a/ui/src/pages/Admin/OidcConfigPage.tsx b/ui/src/pages/Admin/OidcConfigPage.tsx
index 24c22570..dc279b2d 100644
--- a/ui/src/pages/Admin/OidcConfigPage.tsx
+++ b/ui/src/pages/Admin/OidcConfigPage.tsx
@@ -38,8 +38,17 @@ export default function OidcConfigPage() {
   const { toast } = useToast();
 
   useEffect(() => {
-    adminFetch<OidcFormData>('/oidc')
-      .then(setForm)
+    adminFetch<Partial<OidcFormData> & { configured?: boolean }>('/oidc')
+      .then((data) => setForm({
+        enabled: data.enabled ?? false,
+        autoSignup: data.autoSignup ?? true,
+        issuerUri: data.issuerUri ?? '',
+        clientId: data.clientId ?? '',
+        clientSecret: data.clientSecret ?? '',
+        rolesClaim: data.rolesClaim ?? 'roles',
+        displayNameClaim: data.displayNameClaim ?? 'name',
+        defaultRoles: data.defaultRoles ?? ['VIEWER'],
+      }))
       .catch(() => setForm(EMPTY_CONFIG));
   }, []);