diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index fc1c41895a4..a8d068cfd7d 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -160,10 +160,6 @@ else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page wit
 {
 	$conf->entity = DOLENTITY;
 }
-else if (!empty($_COOKIE['DOLENTITY']))						    // For other application with MultiCompany module (TODO: We should remove this. entity to use should never be stored into client side)
-{
-	$conf->entity = $_COOKIE['DOLENTITY'];
-}
 
 // Sanitize entity
 if (! is_numeric($conf->entity)) $conf->entity=1;