diff --git a/backend/src/services/ScriptExecutor.ts b/backend/src/services/ScriptExecutor.ts
index d81ecd1..e41ea72 100644
--- a/backend/src/services/ScriptExecutor.ts
+++ b/backend/src/services/ScriptExecutor.ts
@@ -37,6 +37,11 @@ export class ScriptExecutor {
         });
 
         const dbId = (query as any).database_id || context.databaseId;
+
+        if (!dbId) {
+          throw new Error(`Database ID not found. Query database_id: ${(query as any).database_id}, Context databaseId: ${context.databaseId}. Please specify database_id in the query configuration.`);
+        }
+
         const result = await sqlExecutor.executeQuery(dbId, processedQuery, paramValues);
 
         return {
@@ -161,6 +166,13 @@ print(json.dumps(result))
             // Используем database_id из запроса, если указан, иначе из контекста
             const dbId = (query as any).database_id || context.databaseId;
 
+            if (!dbId) {
+              python.stdin.write(JSON.stringify({
+                error: `Database ID not found. Query database_id: ${(query as any).database_id}, Context databaseId: ${context.databaseId}. Please specify database_id in the query configuration.`
+              }) + '\n');
+              continue;
+            }
+
             const result = await sqlExecutor.executeQuery(
               dbId,
               processedQuery,