diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index b8e91f721f..55d5ccb85f 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-30  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Set unknown modules to normal if new data
+	  arrives but ff_threshold is greater than 0.
+
 2014-07-28  Ramon Novoa  <rnovoa@artica.es>
 
 	* conf/pandora_server.conf.new,
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 1a92f16988..bc480fe1c7 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1132,12 +1132,10 @@ sub pandora_process_module ($$$$$$$$$;$) {
 		# Update module status count
 		pandora_mark_agent_for_module_update ($dbh, $agent->{'id_agente'});
 	}
-	# Set not-init modules to normal even if min_ff_event is not matched the first time they receive data
-	elsif ($status == 4) {
-		$new_status = 0;
-		
-		generate_status_event ($pa_config, $processed_data, $agent, $module, $new_status, $status, $last_known_status, $dbh);
-		$status = $new_status;
+	# Set not-init or unknown modules to normal even if min_ff_event is not matched the first time they receive data
+	elsif ($status == 3 || $status == 4) {
+		generate_status_event ($pa_config, $processed_data, $agent, $module, 0, $status, $last_known_status, $dbh);
+		$status = 0;
 
 		# Update module status count
 		pandora_mark_agent_for_module_update ($dbh, $agent->{'id_agente'});