diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 60fdf42be7..7f33e4072f 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-05 Hirofumi Kosaka <kosaka@rworks.jp>
+
+	* lib/PandoraFMS/Core.pm: Fixed that unknown modules would be
+	set to normal if its status is not normal, when new data
+	arrives but ff_threshold is greater than 0.
+
 2014-07-30  Ramon Novoa  <rnovoa@artica.es>
 
 	* util/trap_rate.sh: Added to repository. Script to calculate the rate of
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index bc480fe1c7..b670d2a7c2 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1132,10 +1132,10 @@ sub pandora_process_module ($$$$$$$$$;$) {
 		# Update module status count
 		pandora_mark_agent_for_module_update ($dbh, $agent->{'id_agente'});
 	}
-	# Set not-init or unknown modules to normal even if min_ff_event is not matched the first time they receive data
+	# Set not-init or unknown modules to its current status 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;
+		generate_status_event ($pa_config, $processed_data, $agent, $module, $new_status, $status, $last_known_status, $dbh);
+		$status = $new_status;
 
 		# Update module status count
 		pandora_mark_agent_for_module_update ($dbh, $agent->{'id_agente'});