diff --git a/app/code/Magento/Catalog/Setup/UpgradeSchema.php b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
index db0aaa3a010e3..f31f85be15179 100755
--- a/app/code/Magento/Catalog/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
@@ -34,6 +34,10 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
         }
 
         if (version_compare($context->getVersion(), '2.1.4', '<')) {
+            $this->addSourceEntityIdToProductEavIndex($setup);
+        }
+
+        if (version_compare($context->getVersion(), '2.1.5', '<')) {
             $this->addPercentageValueColumn($setup);
             $tables = [
                 'catalog_product_index_price_cfg_opt_agr_idx',
@@ -56,7 +60,6 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                     ['type' => 'integer', 'nullable' => false]
                 );
             }
-            $this->addSourceEntityIdToProductEavIndex($setup);
             $this->recreateCatalogCategoryProductIndexTmpTable($setup);
         }