diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index ef617343aa..1f13627cb3 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -314,9 +314,6 @@ sub pandora_server_tasks ($) {
 					
 					# Check if an autodisabled agent needs to be autodisable
 					pandora_disable_autodisable_agents ($pa_config, $dbh); 
-					
-					# Set event storm protection
-					pandora_set_event_storm_protection (pandora_get_tconfig_token ($dbh, 'event_storm_protection', 0));
 				}
 				
 				# TASKS EXECUTED EVERY 60 SECONDS (High latency tasks)
@@ -355,6 +352,9 @@ sub pandora_server_tasks ($) {
 			# Rotate Log File
 			if (($counter % 30) == 0) {
 				pandora_rotate_logfile($pa_config);
+				
+				# Set event storm protection
+				pandora_set_event_storm_protection (pandora_get_tconfig_token ($dbh, 'event_storm_protection', 0));
 			}
 			# Pandora self monitoring
 			if (defined($pa_config->{"self_monitoring"})