diff --git a/ui/app/(ai)/analyst/prompts.ts b/ui/app/(ai)/analyst/prompts.ts
index 6127e7622d..52629a4be7 100644
--- a/ui/app/(ai)/analyst/prompts.ts
+++ b/ui/app/(ai)/analyst/prompts.ts
@@ -192,14 +192,7 @@ const providerAgentPrompt = `You are Prowler's Provider Agent, specializing in p
   - provider_id
   - provider_uid
   - provider_alias
-- Mentioning all keys in the function call is mandatory. Don't skip any keys.
-
-## Error Handling
-
-- If user information is unavailable, report specific reason when possible
-- For invalid user requests, indicate the error without speculation
-
-Ensure all responses are factual and directly address the user information requested.`;
+- Mentioning all keys in the function call is mandatory. Don't skip any keys.`;
 
 const tasksAgentPrompt = `You are Prowler's Tasks Agent, specializing in cloud security scanning activities and task management.
 
@@ -213,15 +206,7 @@ const tasksAgentPrompt = `You are Prowler's Tasks Agent, specializing in cloud s
 - Present task statuses, timestamps, and completion information clearly
 - Order tasks by recency or status as appropriate for the query
 - Answer directly without unnecessary introductions or conclusions
-- Mentioning all keys in the function call is mandatory. Don't skip any keys.
-
-## Error Handling
-
-- If task information is unavailable, report specific reason when possible
-- For invalid task IDs or parameters, indicate the error without speculation
-- If task status is ambiguous, report known information without assumptions
-
-Return only factual information about tasks without adding speculative information or unnecessary elaboration.`;
+- Mentioning all keys in the function call is mandatory. Don't skip any keys.`;
 
 const scansAgentPrompt = `You are Prowler's Scans Agent, who can fetch information about scans for different providers.
 
@@ -298,13 +283,7 @@ const overviewAgentPrompt = `You are Prowler's Overview Agent, specializing in h
 - Highlight critical areas requiring attention
 - Answer directly without unnecessary introductions or conclusions
 - Mentioning all keys in the function call is mandatory. Don't skip any keys.
-
-## Error Handling
-
-- If user information is unavailable, report specific reason when possible
-- For invalid user requests, indicate the error without speculation
-
-Ensure all responses are factual and directly address the user information requested.`;
+- Don't add empty filters in the function call.`;
 
 const rolesAgentPrompt = `You are Prowler's Roles Agent, specializing in role and permission information within the Prowler system.
 
@@ -319,15 +298,7 @@ const rolesAgentPrompt = `You are Prowler's Roles Agent, specializing in role an
 - Format role IDs, permissions, and descriptions consistently
 - When multiple roles exist, organize them logically based on the query
 - Answer directly without unnecessary introductions or conclusions
-- Mentioning all keys in the function call is mandatory. Don't skip any keys.
-
-## Error Handling
-
-- If role information is unavailable, report specific reason when possible
-- For invalid role parameters, indicate the error without speculation
-- If requested role doesn't exist, clearly state this without speculation
-
-Return only factual information about roles without adding speculative information or unnecessary elaboration.`;
+- Mentioning all keys in the function call is mandatory. Don't skip any keys.`;
 
 export {
   complianceAgentPrompt,