diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumns.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumns.cs
index 41289c6e4e..4a22607a48 100644
--- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumns.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumns.cs
@@ -56,7 +56,7 @@ public class AddPropertyTypeGroupColumns : MigrationBase
         AddColumn<PropertyTypeGroupDto>("alias", out IEnumerable<string> sqls);
 
         // Populate non-null alias column
-        List<PropertyTypeGroupDto>? dtos = Database.Fetch<PropertyTypeGroupDto>();
+        List<PropertyTypeGroupDto>? dtos = Database.Query<PropertyTypeGroupDto>().Where(x => x.Alias == null).ToList();
         foreach (PropertyTypeGroupDto dto in PopulateAliases(dtos))
         {
             Database.Update(dto, x => new { x.Alias });