diff --git a/Directory.Build.props b/Directory.Build.props
index d0521a60fdce6..ef5643117e716 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -84,10 +84,8 @@
 		<StackTraceSupport>false</StackTraceSupport>
 		<UseNativeHttpHandler>true</UseNativeHttpHandler>
 		<TrimMode>partial</TrimMode>
-	</PropertyGroup>
 
-	<!-- TODO: Perhaps can be removed with stable release of .NET 9 -->
-	<ItemGroup Condition="'$(Configuration)' == 'Release'">
-		<RuntimeHostConfigurationOption Include="System.ComponentModel.DefaultValueAttribute.IsSupported" Value="true" Trim="true" />
-	</ItemGroup>
+		<!-- TODO: Perhaps can be removed with stable release of .NET 9 -->
+		<_DefaultValueAttributeSupport>true</_DefaultValueAttributeSupport>
+	</PropertyGroup>
 </Project>