diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/MissingContentVersionsIndexes.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/MissingContentVersionsIndexes.cs
index 8d80f4f0da..b69ac8f9dc 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/MissingContentVersionsIndexes.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/MissingContentVersionsIndexes.cs
@@ -15,16 +15,11 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_6_0
                 .OnTable(ContentVersionDto.TableName)
                 .OnColumn("nodeId")
                 .Ascending()
-                .WithOptions().NonClustered()
-                .Do();
-
-            Create
-                .Index("IX_" + ContentVersionDto.TableName + "_Current")
-                .OnTable(ContentVersionDto.TableName)
                 .OnColumn("current")
                 .Ascending()
                 .WithOptions().NonClustered()
                 .Do();
+
         }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
index c31a8aefdc..4b203c128f 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Persistence.Dtos
 
         [Column("nodeId")]
         [ForeignKey(typeof(ContentDto))]
-        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_NodeId")]
+        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_NodeId", ForColumns = "nodeId,current")]
         public int NodeId { get; set; }
 
         [Column("versionDate")] // TODO: db rename to 'updateDate'
@@ -32,7 +32,6 @@ namespace Umbraco.Core.Persistence.Dtos
         public int? UserId { get => _userId == 0 ? null : _userId; set => _userId = value; } //return null if zero
 
         [Column("current")]
-        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_Current")]
         public bool Current { get; set; }
 
         // about current: