diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 72c048d21e..f34c59a59d 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -162,6 +162,7 @@ sub data_consumer ($$) {
 		$AgentSem->down ();
 		delete ($Agents{$agent_name});
 		$AgentSem->up ();
+		return;
 	}
 
 	# Try to parse the XML 2 times, with a delay between tries of 2 seconds
@@ -192,6 +193,7 @@ sub data_consumer ($$) {
 			$AgentSem->down ();
 			delete ($Agents{$agent_name});
 			$AgentSem->up ();
+			return;
 		}
 
 		unlink ($file_name);