diff --git a/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx b/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx
index fd862720a..130773e0c 100644
--- a/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx
@@ -18,6 +18,15 @@ type Props = {
   onSaved: (value: Record<string, any>) => void
 }
 
+const extractDefaultValues = (schemas: any[]) => {
+  const result: Record<string, any> = {}
+  for (const field of schemas) {
+    if (field.default !== undefined)
+      result[field.name] = field.default
+  }
+  return result
+}
+
 const EndpointModal: FC<Props> = ({
   formSchemas,
   defaultValues = {},
@@ -26,7 +35,10 @@ const EndpointModal: FC<Props> = ({
 }) => {
   const getValueFromI18nObject = useRenderI18nObject()
   const { t } = useTranslation()
-  const [tempCredential, setTempCredential] = React.useState<any>(defaultValues)
+  const initialValues = Object.keys(defaultValues).length > 0
+    ? defaultValues
+    : extractDefaultValues(formSchemas)
+  const [tempCredential, setTempCredential] = React.useState<any>(initialValues)
 
   const handleSave = () => {
     for (const field of formSchemas) {