diff --git a/controllers/front/productdatagenerate.php b/controllers/front/productdatagenerate.php
index 63c8cab..3f5e4d9 100644
--- a/controllers/front/productdatagenerate.php
+++ b/controllers/front/productdatagenerate.php
@@ -69,12 +69,12 @@ class ProductLinkCheckerProductDataGenerateModuleFrontController extends ModuleF
                         // Grouping meta fields for clarity
                         'meta_description' => $product->meta_description,
                         'title' => $product->name,
-                        'description' => $product->description,
-                        'description_short' => $product->description_short,
-                        'mpn' => $product->mpn,
-                        'reference' => $product->reference,
-                        'ean13' => $product->ean13,
-                        'upc' => $product->upc,
+                        'description' => Tools::getValue('plc_no_description') ? null : $product->description,
+                        'description_short' => Tools::getValue('plc_no_description_short') ? null : $product->description_short,
+                        'mpn' => $product->mpn ?? null,
+                        'reference' => $product->reference ?? null,
+                        'ean13' => $product->ean13 ?? null,
+                        'upc' => $product->upc ?? null,
                         'id_language' => (int)$id_lang,
                         'id_shop' => (int)$id_shop,
                         'link' => $this->context->link->getProductLink($product),
@@ -94,13 +94,13 @@ class ProductLinkCheckerProductDataGenerateModuleFrontController extends ModuleF
                                     'meta_description' => $product->meta_description,
                                     // Title and descriptions are also from the main product
                                     'title' => $product->name,
-                                    'description' => $product->description,
-                                    'description_short' => $product->description_short,
+                                    'description' => Tools::getValue('plc_no_description') ? null : $product->description,
+                                    'description_short' => Tools::getValue('plc_no_description_short') ? null : $product->description_short,
                                     // These fields are specific to the combination
-                                    'mpn' => $combination['mpn'],
-                                    'reference' => $combination['reference'],
-                                    'ean13' => $combination['ean13'],
-                                    'upc' => $combination['upc'],
+                                    'mpn' => $combination['mpn'] ?? null,
+                                    'reference' => $combination['reference'] ?? null,
+                                    'ean13' => $combination['ean13'] ?? null,
+                                    'upc' => $combination['upc'] ?? null,
                                     'id_language' => (int)$id_lang,
                                     'id_shop' => (int)$id_shop,
                                     'link' => $this->context->link->getProductLink($product, null, null, null, (int)$id_lang, (int)$id_shop, (int)$combination['id_product_attribute']),