diff --git a/frontend/src/components/EndpointModal.tsx b/frontend/src/components/EndpointModal.tsx
index e07eada..9886584 100644
--- a/frontend/src/components/EndpointModal.tsx
+++ b/frontend/src/components/EndpointModal.tsx
@@ -74,21 +74,22 @@ export default function EndpointModal({
 
       if (formData.execution_type === 'script') {
         // Для скриптов используем database_id из первого запроса или пустую строку
-        const firstDbId = formData.script_queries.length > 0 ? formData.script_queries[0].database_id : '';
+        const scriptQueries = formData.script_queries || [];
+        const firstDbId = scriptQueries.length > 0 ? scriptQueries[0].database_id : '';
         return endpointsApi.test({
           database_id: firstDbId || '',
           execution_type: 'script',
-          script_language: formData.script_language,
-          script_code: formData.script_code,
-          script_queries: formData.script_queries,
+          script_language: formData.script_language || 'javascript',
+          script_code: formData.script_code || '',
+          script_queries: scriptQueries,
           parameters: paramValues,
           endpoint_parameters: formData.parameters,
         });
       } else {
         return endpointsApi.test({
-          database_id: formData.database_id,
+          database_id: formData.database_id || '',
           execution_type: 'sql',
-          sql_query: formData.sql_query,
+          sql_query: formData.sql_query || '',
           parameters: paramValues,
           endpoint_parameters: formData.parameters,
         });