diff --git a/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs b/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs
index b6747539b35..aafeac6f7f8 100644
--- a/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs
+++ b/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs
@@ -61,6 +61,12 @@ public static class RelationalEntityTypeExtensions
             return entityType.GetRootType().GetTableName();
         }
 
+        if (entityType.GetMappingStrategy() == RelationalAnnotationNames.TpcMappingStrategy
+            && !entityType.ClrType.IsInstantiable())
+        {
+            return null;
+        }
+
         var ownership = entityType.FindOwnership();
         if (ownership != null
             && (ownership.IsUnique || entityType.IsMappedToJson()))
@@ -81,12 +87,6 @@ public static class RelationalEntityTypeExtensions
                 : $"{ownership.PrincipalToDependent.Name}_{name}";
         }
 
-        if (entityType.GetMappingStrategy() == RelationalAnnotationNames.TpcMappingStrategy
-            && !entityType.ClrType.IsInstantiable())
-        {
-            return null;
-        }
-
         return truncate
             ? Uniquifier.Truncate(name, entityType.Model.GetMaxIdentifierLength())
             : name;