diff --git a/lib/db/install.xml b/lib/db/install.xml
index d78f754bb13..68351169d14 100644
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -634,7 +634,7 @@
       <INDEXES>
         <INDEX NAME="type" UNIQUE="false" FIELDS="type"/>
         <INDEX NAME="convhash" UNIQUE="false" FIELDS="convhash"/>
-        <INDEX NAME="component-itemtype-contextid-itemid" UNIQUE="false" FIELDS="component, itemtype, contextid, itemid"/>
+        <INDEX NAME="component-itemtype-itemid-contextid" UNIQUE="false" FIELDS="component, itemtype, itemid, contextid"/>
       </INDEXES>
     </TABLE>
     <TABLE NAME="message_conversation_members" COMMENT="Stores all members in a conversations">
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 40924a1c994..2aa8774f0d2 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2643,7 +2643,7 @@ function xmldb_main_upgrade($oldversion) {
         $dbman->add_key($table, $key);
 
         // Add index.
-        $index = new xmldb_index('component-itemtype-contextid-itemid', XMLDB_INDEX_NOTUNIQUE, ['component', 'itemtype',
+        $index = new xmldb_index('component-itemtype-itemid-contextid', XMLDB_INDEX_NOTUNIQUE, ['component', 'itemtype',
             'itemid', 'contextid']);
         if (!$dbman->index_exists($table, $index)) {
             $dbman->add_index($table, $index);