diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 4000dc4d6f1..3f938fe778c 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -161,8 +161,10 @@ class Conf
 	 */
 	public function setEntityValues($db, $entity)
 	{
-		$this->entity = $entity;
-		$this->setValues($db);
+		if ($this->entity != $entity) {
+			$this->entity = $entity;
+			$this->setValues($db);
+		}
 	}
 
 	/**