diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index f5df71c5a3..2c4a6f285c 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-26  KIKUCHI koichiro <koichiro@rworks.jp>
+
+	* lib/PandoraFMS/DB.pm: Fixed get_agent_status to return warning status
+	 correctly.
+
 2013-11-13  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/DataServer.pm: Fixed a bug when a parent was defined but
diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index 6fc77046e2..c5f93dc692 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -352,7 +352,7 @@ sub get_agent_status ($$$) {
 		# AGENT_MODULE_STATUS_CRITICAL_ALERT
 		# AGENT_MODULE_STATUS_CRITICAL_BAD
 		# AGENT_MODULE_STATUS_WARNING
-		# AGENT_MODULE_STATUS_UNKNOW
+		# AGENT_MODULE_STATUS_UNKNOWN
 		# AGENT_MODULE_STATUS_NORMAL
 		if ($m_status == 4) {
 			$module_status = 4;
@@ -365,7 +365,7 @@ sub get_agent_status ($$$) {
 				if ($m_status == 2) {
 					$module_status = 2;
 				}
-				else {
+				elsif ($module_status != 2) {
 					if ($m_status == 0) {
 						$module_status = 0;
 					}