diff --git a/retailcrm/lib/settings/RetailcrmSettings.php b/retailcrm/lib/settings/RetailcrmSettings.php
index 7bdaf4d..16cb4e6 100644
--- a/retailcrm/lib/settings/RetailcrmSettings.php
+++ b/retailcrm/lib/settings/RetailcrmSettings.php
@@ -95,10 +95,11 @@ class RetailcrmSettings
     private function setClientId()
     {
         $context = Context::getContext();
+        $clientId = uniqid();
 
         Configuration::updateValue(RetailCRM::CLIENT_ID, hash(
             'sha256',
-            $context->shop->id . Configuration::get('PS_SHOP_DOMAIN')
+            $context->shop->id . Configuration::get('PS_SHOP_DOMAIN') . $clientId
         ));
 
         return true;
diff --git a/retailcrm/retailcrm.php b/retailcrm/retailcrm.php
index 063c22a..0305bb8 100755
--- a/retailcrm/retailcrm.php
+++ b/retailcrm/retailcrm.php
@@ -309,7 +309,8 @@ class RetailCRM extends Module
         if (Shop::isFeatureActive()) {
             $shops = Shop::getShops();
         } else {
-            $shops[] = Shop::getContext();
+            $context = Context::getContext();
+            $shops[]['id_shop'] = $context->shop->id;
         }
 
         foreach ($shops as $shop) {
@@ -371,7 +372,7 @@ class RetailCRM extends Module
             return false;
         }
 
-        $context = Shop::getContext();
+        $context = Context::getContext();
 
         self::updateCrmModuleState($context->shop->id, false);