diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index cafc0c0a04..5985c81741 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-02  Ramon Novoa  <rnovoa@artica.es>
+
+	* conf/pandora_server.conf,
+	  lib/PandoraFMS/Config.pm,
+	  lib/PandoraFMS/Core.pm: Removed the inhibit_alerts configuration
+	  token. Alert inhibition is configured on a per-agent basis.
+
 2009-09-02  Ramon Novoa  <rnovoa@artica.es>
 
 	* conf/pandora_server.conf: Added sample configurations for
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index 4edf3b7a13..7d990109de 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -219,5 +219,3 @@ max_queue_files 250
 # Use the XML file last modification time as timestamp.
 # use_xml_timestamp 1
 
-# Inhibit agent alerts if the parent has fired a critical alert.
-# inhibit_alerts 1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 4e2d2d2574..3afcb7ddca 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -226,9 +226,6 @@ sub pandora_load_config {
 	# Ignore the timestamp in the XML and use the file timestamp instead
     $pa_config->{'use_xml_timestamp'} = 0; 
 
-	# Inhibit alerts if the parent agent fired a critical alert
-    $pa_config->{'inhibit_alerts'} = 0;
-	
 	# Check for UID0
     if ($pa_config->{"quiet"} != 0){
 	    if ($> == 0){
@@ -494,9 +491,6 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^use_xml_timestamp\s([0-1])/i) {
 			$pa_config->{'use_xml_timestamp'} = clean_blank($1);
 		}
-		elsif ($parametro =~ m/^inhibit_alerts\s([0-1])/i) {
-			$pa_config->{'inhibit_alerts'} = clean_blank($1);
-		}
 	} # end of loop for parameter #
 
 
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 824e6865da..a2476a02c7 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1162,7 +1162,7 @@ sub export_module_data ($$$$$$) {
 sub pandora_inhibit_alerts ($$$) {
 	my ($pa_config, $agent, $dbh) = @_;
 
-	return 0 if ($pa_config->{'inhibit_alerts'} ne '1' || $agent->{'id_parent'} eq '0');
+	return 0 if ($agent->{'cascade_protection'} ne '1' || $agent->{'id_parent'} eq '0');
 
 	# Are any of the parent's critical alerts fired?	
 	my $count = get_db_value ($dbh, 'SELECT COUNT(*) FROM tagente_modulo, talert_template_modules, talert_templates