diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 2c6a54824..afeec34ac 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -1040,7 +1040,7 @@ abstract class ObjectModelCore
 				$multi_shop_join = ' LEFT JOIN `'._DB_PREFIX_.bqSQL($this->def['table']).'_'.bqSQL($assoc['type']).'`
 										AS `multi_shop_'.bqSQL($this->def['table']).'`
 										ON (main.`'.bqSQL($this->def['primary']).'` = `multi_shop_'.bqSQL($this->def['table']).'`.`'.bqSQL($this->def['primary']).'`)';
-				$sql_filter = 'AND id_shop = '.Context::getContext()->shop->id.' '.$sql_filter;
+				$sql_filter = 'AND `multi_shop_'.bqSQL($this->def['table']).'`.id_shop = '.Context::getContext()->shop->id.' '.$sql_filter;
 				$sql_join = $multi_shop_join.' '.$sql_join;
 			}
 			else
diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql
index 80704339e..f018924df 100644
--- a/install-dev/data/db_structure.sql
+++ b/install-dev/data/db_structure.sql
@@ -360,7 +360,6 @@ CREATE TABLE `PREFIX_category_product` (
 
 CREATE TABLE `PREFIX_cms` (
   `id_cms` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
   `id_cms_category` int(10) unsigned NOT NULL,
   `position` int(10) unsigned NOT NULL DEFAULT '0',
   `active` tinyint(1) unsigned NOT NULL default '0',
diff --git a/install-dev/upgrade/sql/1.5.0.18.sql b/install-dev/upgrade/sql/1.5.0.18.sql
index fba437d66..d20e24090 100644
--- a/install-dev/upgrade/sql/1.5.0.18.sql
+++ b/install-dev/upgrade/sql/1.5.0.18.sql
@@ -17,3 +17,5 @@ ALTER TABLE `PREFIX_attribute_impact` CHANGE `weight` `weight` DECIMAL(20, 6) NO
 ALTER TABLE `PREFIX_order_detail` CHANGE `product_weight` `product_weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
 ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`;
 ALTER TABLE `PREFIX_stock_available` ADD UNIQUE (`id_product`, `id_product_attribute`, `id_shop`);
+ALTER TABLE `PREFIX_cms` DROP `id_shop`;
+ALTER TABLE `PREFIX_cms` ADD INDEX (`id_cms_category`);