diff --git a/Content.Server.Database/SnakeCaseNaming.cs b/Content.Server.Database/SnakeCaseNaming.cs
index ca1a9665848..27ce392cd50 100644
--- a/Content.Server.Database/SnakeCaseNaming.cs
+++ b/Content.Server.Database/SnakeCaseNaming.cs
@@ -301,14 +301,14 @@ public void ProcessModelFinalizing(IConventionModelBuilder modelBuilder, IConven
         private static void RewriteColumnName(IConventionPropertyBuilder propertyBuilder)
         {
             var property = propertyBuilder.Metadata;
-            var entityType = property.DeclaringEntityType;
+            var entityType = (IConventionEntityType)property.DeclaringType;
 
             if (entityType.ClrType == typeof(Microsoft.EntityFrameworkCore.Migrations.HistoryRow))
                 return;
 
             property.Builder.HasNoAnnotation(RelationalAnnotationNames.ColumnName);
 
-            var baseColumnName = StoreObjectIdentifier.Create(property.DeclaringEntityType, StoreObjectType.Table) is { } tableIdentifier
+            var baseColumnName = StoreObjectIdentifier.Create(entityType, StoreObjectType.Table) is { } tableIdentifier
                 ? property.GetDefaultColumnName(tableIdentifier)
                 : property.GetDefaultColumnName();