diff --git a/classes/Configuration.php b/classes/Configuration.php
index 65cc3d8b4..ee8871754 100644
--- a/classes/Configuration.php
+++ b/classes/Configuration.php
@@ -505,9 +505,9 @@ class ConfigurationCore extends ObjectModel
 		if ($id_shop)
 			return ' AND id_shop = '.(int)$id_shop;
 		elseif ($id_shop_group)
-			return ' AND id_shop_group = '.(int)$id_shop_group.' AND id_shop IS NULL';
+			return ' AND id_shop_group = '.(int)$id_shop_group.' AND (id_shop IS NULL OR id_shop = 0)';
 		else
-			return ' AND id_shop_group IS NULL AND id_shop IS NULL';
+			return ' AND (id_shop_group IS NULL OR id_shop_group = 0) AND (id_shop IS NULL OR id_shop = 0)';
 	}
 
 	/**