From f20951bb82f09a592614a9946b2993c7a75c6f47 Mon Sep 17 00:00:00 2001
From: Nam Luu <nam.luu@isobar.com>
Date: Tue, 29 Jul 2025 22:24:45 +0700
Subject: [PATCH] Add config checking

---
 Model/Plugin/Subscriber.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Model/Plugin/Subscriber.php b/Model/Plugin/Subscriber.php
index 600242040..01d5a7cc6 100644
--- a/Model/Plugin/Subscriber.php
+++ b/Model/Plugin/Subscriber.php
@@ -112,15 +112,17 @@ public function afterLoadBySubscriberEmail(\Magento\Newsletter\Model\Subscriber
      */
     public function afterLoadByCustomer(\Magento\Newsletter\Model\Subscriber $subscriber, $customerId, $websiteId)
     {
-        try {
-            if (!$this->_helper->getConfigValue(
-                \Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL,
-                $subscriber->getStoreId()
-            )) {
-                $subscriber->setImportMode(true);
+        if ($this->_helper->isMailChimpEnabled($subscriber->getStoreId())) {
+            try {
+                if (!$this->_helper->getConfigValue(
+                    \Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL,
+                    $subscriber->getStoreId()
+                )) {
+                    $subscriber->setImportMode(true);
+                }
+            } catch (\Exception $exception) {
+                $this->_helper->log($exception->getMessage());
             }
-        } catch (\Exception $exception) {
-            $this->_helper->log($exception->getMessage());
         }
 
         return $subscriber;