diff --git a/classes/Category.php b/classes/Category.php
index 24076a287..7286a630d 100644
--- a/classes/Category.php
+++ b/classes/Category.php
@@ -1048,7 +1048,7 @@ class CategoryCore extends ObjectModel
 			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
 				SELECT ctg.`id_group`
 				FROM '._DB_PREFIX_.'category_group ctg
-				WHERE ctg.`id_category` = '.(int)$this->id.' AND ctg.`id_group` = 1
+				WHERE ctg.`id_category` = '.(int)$this->id.' AND ctg.`id_group` = '.(int)Group::getCurrent()->id.'
 			');
 		} else {
 			$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
diff --git a/classes/Product.php b/classes/Product.php
index 3855b2d11..d0e1f61a5 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -4234,7 +4234,7 @@ class ProductCore extends ObjectModel
 			SELECT ctg.`id_group`
 			FROM `'._DB_PREFIX_.'category_product` cp
 			INNER JOIN `'._DB_PREFIX_.'category_group` ctg ON (ctg.`id_category` = cp.`id_category`)
-			WHERE cp.`id_product` = '.(int)$this->id.' AND ctg.`id_group` = 1');
+			WHERE cp.`id_product` = '.(int)$this->id.' AND ctg.`id_group` ='.(int)Group::getCurrent()->id);
 		else
 			return (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 			SELECT cg.`id_group`