diff --git a/src/EFCore.Relational/Metadata/Conventions/SharedTableConvention.cs b/src/EFCore.Relational/Metadata/Conventions/SharedTableConvention.cs
index a99efd10fa0..2982eb724e1 100644
--- a/src/EFCore.Relational/Metadata/Conventions/SharedTableConvention.cs
+++ b/src/EFCore.Relational/Metadata/Conventions/SharedTableConvention.cs
@@ -56,7 +56,6 @@ public virtual void ProcessModelFinalized(IConventionModelBuilder modelBuilder,
                 columns.Clear();
                 keys.Clear();
                 foreignKeys.Clear();
-                indexes.Clear();
 
                 foreach (var entityType in entityTypes)
                 {
diff --git a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs
index 5ae28e1f9f5..80090b90e57 100644
--- a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs
@@ -79,14 +79,18 @@ public override void Identifiers_are_generated_correctly()
                 Assert.Equal(
                     "LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkin~1",
                     entityType2.GetTableName());
-
+                Assert.Equal(
+                    "PK_LoginDetails",
+                    entityType2.GetKeys().Single().GetName());
                 Assert.Equal(
                     "ExtraPropertyWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingCo~",
                     entityType2.GetProperties().ElementAt(1).GetColumnName());
-
                 Assert.Equal(
                     "ExtraPropertyWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingC~1",
                     entityType2.GetProperties().ElementAt(2).GetColumnName());
+                Assert.Equal(
+                    "IX_LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWor~1",
+                    entityType2.GetIndexes().Single().GetName());
             }
         }