diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 3f938fe778c..7b35aad3075 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -163,8 +163,10 @@ class Conf
 	{
 		if ($this->entity != $entity) {
 			$this->entity = $entity;
-			$this->setValues($db);
+			return $this->setValues($db);
 		}
+
+		return 0;
 	}
 
 	/**
@@ -176,6 +178,8 @@ class Conf
 	 */
 	public function setValues($db)
 	{
+		dol_syslog(get_class($this)."::setValues");
+
 		// Unset all old modules values
 		if (!empty($this->modules)) {
 			foreach ($this->modules as $m) {
@@ -228,8 +232,6 @@ class Conf
 			'syslog' => array(),
 		);
 
-		dol_syslog(get_class($this)."::setValues");
-
 		//Define all global constants into $this->global->key=value
 		$sql = "SELECT ".$db->decrypt('name')." as name,";
 		$sql .= " ".$db->decrypt('value')." as value, entity";