diff --git a/classes/Context.php b/classes/Context.php
index ee329228d..38962c4e4 100644
--- a/classes/Context.php
+++ b/classes/Context.php
@@ -110,7 +110,8 @@ class ContextCore
 
 	public function __construct()
 	{
-		$this->mobile_detect = new Mobile_Detect();
+		if ((bool)Configuration::get('PS_ALLOW_MOBILE_DEVICE'))
+			$this->mobile_detect = new Mobile_Detect();
 	}
 
 	public function getMobileDevice()