diff --git a/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowItem.php b/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowItem.php
index 28bd1d17a91..76e4e462282 100644
--- a/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowItem.php
+++ b/src/Oro/Bundle/WorkflowBundle/Entity/WorkflowItem.php
@@ -27,8 +27,7 @@
  *          @ORM\UniqueConstraint(name="oro_workflow_item_entity_definition_unq",columns={"entity_id", "workflow_name"})
  *      },
  *      indexes={
- *          @ORM\Index(name="oro_workflow_item_workflow_name_idx", columns={"workflow_name"}),
- *          @ORM\Index(name="oro_workflow_item_entity_idx", columns={"entity_class", "entity_id"})
+ *          @ORM\Index(name="oro_workflow_item_workflow_name_idx", columns={"workflow_name"})
  *      }
  *  )
  * @ORM\Entity(repositoryClass="Oro\Bundle\WorkflowBundle\Entity\Repository\WorkflowItemRepository")
diff --git a/src/Oro/Bundle/WorkflowBundle/Migrations/Schema/OroWorkflowBundleInstaller.php b/src/Oro/Bundle/WorkflowBundle/Migrations/Schema/OroWorkflowBundleInstaller.php
index d398b7b505d..f0746e1d825 100644
--- a/src/Oro/Bundle/WorkflowBundle/Migrations/Schema/OroWorkflowBundleInstaller.php
+++ b/src/Oro/Bundle/WorkflowBundle/Migrations/Schema/OroWorkflowBundleInstaller.php
@@ -18,7 +18,7 @@ class OroWorkflowBundleInstaller implements Installation
      */
     public function getMigrationVersion()
     {
-        return 'v2_1_1';
+        return 'v2_1';
     }
 
     /**
@@ -71,7 +71,6 @@ protected function createOroWorkflowItemTable(Schema $schema)
         $table->addColumn('updated', 'datetime', ['notnull' => false]);
         $table->addColumn('data', 'text', ['notnull' => false]);
         $table->addIndex(['workflow_name'], 'idx_169789ae1bbc6e3d', []);
-        $table->addIndex(['entity_class', 'entity_id'], 'oro_workflow_item_entity_idx', []);
         $table->setPrimaryKey(['id']);
         $table->addIndex(['current_step_id'], 'idx_169789aed9bf9b19', []);
         $table->addUniqueIndex(['entity_id', 'workflow_name'], 'oro_workflow_item_entity_definition_unq');
diff --git a/src/Oro/Bundle/WorkflowBundle/Migrations/Schema/v2_1_1/AddWorkflowItemIndex.php b/src/Oro/Bundle/WorkflowBundle/Migrations/Schema/v2_1_1/AddWorkflowItemIndex.php
deleted file mode 100644
index 16f2ac0b465..00000000000
--- a/src/Oro/Bundle/WorkflowBundle/Migrations/Schema/v2_1_1/AddWorkflowItemIndex.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Oro\Bundle\WorkflowBundle\Migrations\Schema\v2_1_1;
-
-use Doctrine\DBAL\Schema\Schema;
-
-use Oro\Bundle\MigrationBundle\Migration\Migration;
-use Oro\Bundle\MigrationBundle\Migration\QueryBag;
-
-class AddWorkflowItemIndex implements Migration
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function up(Schema $schema, QueryBag $queries)
-    {
-        $table = $schema->getTable('oro_workflow_item');
-        $table->addIndex(['entity_class', 'entity_id'], 'oro_workflow_item_entity_idx', []);
-    }
-}
diff --git a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Datagrid/WorkflowStepColumnListenerTest.php b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Datagrid/WorkflowStepColumnListenerTest.php
index cb886c4318c..8389b538e23 100644
--- a/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Datagrid/WorkflowStepColumnListenerTest.php
+++ b/src/Oro/Bundle/WorkflowBundle/Tests/Unit/Datagrid/WorkflowStepColumnListenerTest.php
@@ -411,7 +411,7 @@ public function buildBeforeAddColumnDataProvider()
                             'join' => [
                                 'inner' => [['join' => self::ALIAS . '.b', 'alias' => 'b']],
                                 'left' => [
-                                    ['join' => self::ALIAS . '.c', 'alias' => 'c']
+                                    ['join' => self::ALIAS . '.c', 'alias' => 'c'],
                                 ]
                             ],
                         ],
@@ -451,7 +451,7 @@ public function buildBeforeAddColumnDataProvider()
                         'columns' => [
                             'rootField' => ['data_name' => self::ALIAS . '.rootField'],
                             'innerJoinField' => ['data_name' => 'b.innerJoinField'],
-                            'leftJoinField' => ['data_name' => 'c.leftJoinField']
+                            'leftJoinField' => ['data_name' => 'c.leftJoinField'],
                         ],
                     ],
                 ],