diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index f4ebda1db5..cbff6aa105 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-16  Ramon Novoa  <rnovoa@artica.es>
+
+	* modules/pandora_module_inventory.cc: Do not output anything if the
+	  module has no data.
+
 2013-08-08  Ramon Novoa  <rnovoa@artica.es>
 
 	* modules/pandora_module_logevent.h: Updated the EventID mask. The
diff --git a/pandora_agents/win32/modules/pandora_module_inventory.cc b/pandora_agents/win32/modules/pandora_module_inventory.cc
index 022d5e9a34..d5f3ecf56f 100644
--- a/pandora_agents/win32/modules/pandora_module_inventory.cc
+++ b/pandora_agents/win32/modules/pandora_module_inventory.cc
@@ -310,12 +310,12 @@ Pandora_Module_Inventory::getXml() {
 	if (!this->has_output || this->inventory_list == NULL) {
 		return "";
 	}
-	
-	module_xml = "\t<inventory>\n";
   
 	if (this->inventory_list && this->inventory_list->size () > 1) {
 		list<Pandora_Data *>::iterator iter;		
 
+		module_xml = "\t<inventory>\n";
+
 		for (iter = this->inventory_list->begin ();
 		     iter != this->inventory_list->end ();
 		     iter++) {