diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference.xml b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference.xml
index 4c0aed4cb7..fcdc7a0853 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference.xml
+++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference.xml
@@ -1348,6 +1348,12 @@
             <columnname>node_deleted</columnname>
           </columnnames>
         </index>
+        <index name="idx_alf_node_txn_del" unique="false">
+          <columnnames>
+            <columnname>transaction_id</columnname>
+            <columnname>node_deleted</columnname>
+          </columnnames>
+        </index>
         <index name="fk_alf_node_acl" unique="false">
           <columnnames>
             <columnname>acl_id</columnname>
diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference.xml b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference.xml
index 618ef9cfd2..467bd9db1b 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference.xml
+++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference.xml
@@ -1410,6 +1410,12 @@
             <columnname>node_deleted</columnname>
           </columnnames>
         </index>
+        <index name="idx_alf_node_txn_del" unique="false">
+          <columnnames>
+            <columnname>transaction_id</columnname>
+            <columnname>node_deleted</columnname>
+          </columnnames>
+        </index>
       </indexes>
     </table>
     <table name="alf_node_aspects">
@@ -2260,6 +2266,7 @@
         <index name="idx_alf_txn_ctms" unique="false">
           <columnnames>
             <columnname>commit_time_ms</columnname>
+            <columnname>id</columnname>
           </columnnames>
         </index>
       </indexes>