diff --git a/repository/src/main/resources/alfresco/dbscripts/db-schema-context.xml b/repository/src/main/resources/alfresco/dbscripts/db-schema-context.xml
index 606cfc0f1a..9e6bd7a9c0 100644
--- a/repository/src/main/resources/alfresco/dbscripts/db-schema-context.xml
+++ b/repository/src/main/resources/alfresco/dbscripts/db-schema-context.xml
@@ -57,6 +57,7 @@
                 <ref bean="patch.db-V6.0-change-set-indexes" />
                 <ref bean="patch.db-V6.3-add-indexes-node-transaction" />
                 <ref bean="patch.db-V7.1.0-remove-alf_server-table" />
+                <ref bean="patch.db-V7.1.0-add-node-txid-index" />
             </list>
         </property>
     </bean>
diff --git a/repository/src/main/resources/alfresco/dbscripts/upgrade/7.1.0/add-node-txid-index.patterns b/repository/src/main/resources/alfresco/dbscripts/upgrade/7.1.0/add-node-txid-index.patterns
new file mode 100644
index 0000000000..5d5a152ce5
--- /dev/null
+++ b/repository/src/main/resources/alfresco/dbscripts/upgrade/7.1.0/add-node-txid-index.patterns
@@ -0,0 +1 @@
+(?i).*missing index.*.alf_node.idx_alf_node_txn
diff --git a/repository/src/main/resources/alfresco/dbscripts/upgrade/7.1.0/org.alfresco.repo.domain.dialect.Dialect/add-node-txid-index.sql b/repository/src/main/resources/alfresco/dbscripts/upgrade/7.1.0/org.alfresco.repo.domain.dialect.Dialect/add-node-txid-index.sql
new file mode 100644
index 0000000000..16f76aae49
--- /dev/null
+++ b/repository/src/main/resources/alfresco/dbscripts/upgrade/7.1.0/org.alfresco.repo.domain.dialect.Dialect/add-node-txid-index.sql
@@ -0,0 +1,23 @@
+--
+-- Title:      Add txid index
+-- Database:   PostgreSQL
+-- Since:      V7.1.0
+-- Author:     Bruno Bossola
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+DROP INDEX idx_alf_node_txn;
+CREATE INDEX idx_alf_node_txn on alf_node (transaction_id);
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V7.1.0-add-node-txid-index';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V7.1.0-add-node-txid-index', 'Creates additional index on alf_node',
+    0, 15001, -1, 15002, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Transaction ID index added to alf_node'
+  );
diff --git a/repository/src/main/resources/alfresco/messages/patch-service.properties b/repository/src/main/resources/alfresco/messages/patch-service.properties
index ef0c0c90c0..2a255f0bdf 100644
--- a/repository/src/main/resources/alfresco/messages/patch-service.properties
+++ b/repository/src/main/resources/alfresco/messages/patch-service.properties
@@ -406,4 +406,4 @@ patch.db-V6.3-add-indexes-node-transaction.description=Create additional indexes
 
 patch.db-V7.1.0-remove-alf_server-table.description=Removes alf_server table and constraints
 
-
+patch.db-V7.1.0-add-node-txid-index.description=Adds the transaction ID index on the alf_node table
diff --git a/repository/src/main/resources/alfresco/patch/patch-services-context.xml b/repository/src/main/resources/alfresco/patch/patch-services-context.xml
index 49a5b90d25..51ee7febc3 100644
--- a/repository/src/main/resources/alfresco/patch/patch-services-context.xml
+++ b/repository/src/main/resources/alfresco/patch/patch-services-context.xml
@@ -1424,6 +1424,21 @@
         </property>
         <property name="ignored"><value>${system.remove-alf_server-table-from-db.ignored}</value></property>
     </bean>
+
+    <bean id="patch.db-V7.1.0-add-node-txid-index" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V7.1.0-add-node-txid-index</value></property>
+        <property name="description"><value>patch.db-V7.1.0-add-node-txid-index.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>15001</value></property>
+        <property name="targetSchema"><value>15002</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/7.1.0/${db.script.dialect}/add-node-txid-index.sql</value>
+        </property>
+        <property name="problemsPatternFileUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/7.1.0/add-node-txid-index.patterns</value>
+        </property>
+        <property name="ignored"><value>${system.add-node-txid-index.ignored}</value></property>
+    </bean>
 <!-- 
  -->
  
diff --git a/repository/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties
index 6012d8c185..e516c16c97 100644
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -3,7 +3,7 @@
 repository.name=Main Repository
 
 # Schema number
-version.schema=15001
+version.schema=15002
 
 # Directory configuration
 
@@ -1244,3 +1244,6 @@ system.tempFileCleaner.maxTimeToRun=
 
 # Property to long running migration to remove alf_server in v7+ patch.db-V7.1.0-remove-alf_server-table
 system.remove-alf_server-table-from-db.ignored=true
+
+# Adds the transaction ID index on the alf_node table
+system.add-node-txid-index.ignored=true