diff --git a/retailcrm/lib/settings/RetailcrmSettings.php b/retailcrm/lib/settings/RetailcrmSettings.php
index 16cb4e6..1740ff2 100644
--- a/retailcrm/lib/settings/RetailcrmSettings.php
+++ b/retailcrm/lib/settings/RetailcrmSettings.php
@@ -71,9 +71,12 @@ class RetailcrmSettings
         if ($this->validator->validate(true)) {
             $this->settings->updateValueAll();
 
-            if (array_key_exists('apiKey', $this->settings->getChanged())) {
+            $shopId = Context::getContext()->shop->id;
+
+            if (array_key_exists('apiKey', $this->settings->getChanged())
+                && !Configuration::get(RetailCRM::CLIENT_ID, null, null, $shopId)) {
                 $this->setClientId();
-                RetailCRM::updateCrmModuleState(Context::getContext()->shop->id);
+                RetailCRM::updateCrmModuleState($shopId);
             }
         }