diff --git a/ChangeLog b/ChangeLog
index 603b5620a92..9b40b269861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ FIX: Trigger on expense report was not fired
 FIX: User creation of expense report not visible
 FIX: warning when adding a line if $remise_percent is an empty string
 FIX: status late on purchase orders
+FIX: ODT generation very slow
 
 
 ***** ChangeLog for 13.0.0 compared to 12.0.0 *****
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index e7ce32cf4b9..d269cd5e5dc 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -138,6 +138,7 @@ class Odf
 		if (strpos($this->contentXml, $tag) === false && strpos($this->stylesXml, $tag) === false) {
 			// Add the throw only for development. In most cases, it is normal to not having the key into the document (only few keys are presents).
 			//throw new OdfException("var $key not found in the document");
+			return $this;
 		}
 
 		$this->vars[$tag] = $this->convertVarToOdf($value, $encode, $charset);