diff --git a/Material.Avalonia.DataGrid/Material.Avalonia.DataGrid.props b/Material.Avalonia.DataGrid/Material.Avalonia.DataGrid.props
index 2553e4a4..977690da 100644
--- a/Material.Avalonia.DataGrid/Material.Avalonia.DataGrid.props
+++ b/Material.Avalonia.DataGrid/Material.Avalonia.DataGrid.props
@@ -1,5 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <RuntimeHostConfigurationOption Include="MaterialThemeIncludeDataGrid" Value="true" />
+    <RuntimeHostConfigurationOption Include="MaterialThemeIncludeDataGrid" Value="true"/>
+    <!--To exclude this library from trimming-->
+    <TrimmerRootAssembly Include="Material.Avalonia.DataGrid"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Material.Avalonia.Demo.Desktop/Material.Avalonia.Demo.Desktop.csproj b/Material.Avalonia.Demo.Desktop/Material.Avalonia.Demo.Desktop.csproj
index 571eb633..e85fcb04 100644
--- a/Material.Avalonia.Demo.Desktop/Material.Avalonia.Demo.Desktop.csproj
+++ b/Material.Avalonia.Demo.Desktop/Material.Avalonia.Demo.Desktop.csproj
@@ -27,7 +27,9 @@
     <ProjectReference Include="..\Material.Avalonia.Demo\Material.Avalonia.Demo.csproj"/>
   </ItemGroup>
 
+  <!--Since Material.Avalonia.DataGrid included as a ProjectReference, auto-imports doesn't work properly-->
   <ItemGroup>
-    <RuntimeHostConfigurationOption Include="MaterialThemeIncludeDataGrid" Value="true" />
+    <RuntimeHostConfigurationOption Include="MaterialThemeIncludeDataGrid" Value="true"/>
+    <TrimmerRootAssembly Include="Material.Avalonia.DataGrid"/>
   </ItemGroup>
 </Project>