diff --git a/admin/tool/lp/db/install.xml b/admin/tool/lp/db/install.xml
index b9aaf57a91b..93ec8dc3a70 100755
--- a/admin/tool/lp/db/install.xml
+++ b/admin/tool/lp/db/install.xml
@@ -298,6 +298,7 @@
       </KEYS>
       <INDEXES>
         <INDEX NAME="cmidruleoutcome" UNIQUE="false" FIELDS="cmid, ruleoutcome" COMMENT="Index on cmid and outcome so we can quickly find what to do when an activity is completed."/>
+        <INDEX NAME="cmidcompetencyid" UNIQUE="false" FIELDS="cmid, competencyid"/>
       </INDEXES>
     </TABLE>
   </TABLES>
diff --git a/admin/tool/lp/db/upgrade.php b/admin/tool/lp/db/upgrade.php
index b73ba662269..315f72992e3 100644
--- a/admin/tool/lp/db/upgrade.php
+++ b/admin/tool/lp/db/upgrade.php
@@ -728,5 +728,20 @@ function xmldb_tool_lp_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2016020901, 'tool', 'lp');
     }
 
+    if ($oldversion < 2016020902) {
+
+        // Define index cmidcompetencyid to be added to tool_lp_module_competency.
+        $table = new xmldb_table('tool_lp_module_competency');
+        $index = new xmldb_index('cmidcompetencyid', XMLDB_INDEX_NOTUNIQUE, array('cmid', 'competencyid'));
+
+        // Conditionally launch add index cmidcompetencyid.
+        if (!$dbman->index_exists($table, $index)) {
+            $dbman->add_index($table, $index);
+        }
+
+        // Lp savepoint reached.
+        upgrade_plugin_savepoint(true, 2016020902, 'tool', 'lp');
+    }
+
     return true;
 }